Update README.md

As VKRenderer_AllocateMaskFillBytes can invalidate draw call state due to overflow, it (and future similar functions) must be called before VK_DRAW.

doc/hotspot-style.html

@@ -207,31 +207,23 @@ the simple "getter".</p></li>
 <ul>
 <li><p>All source files must have a globally unique basename. The build
 system depends on this uniqueness.</p></li>
-<li><p>Keep the include lines within a section alphabetically sorted.</p></li>
-<li><p>Put conditional inclusions (`#if ...`) at the end of the section of HotSpot
-include lines. This also applies to macro-expanded includes of platform
-dependent files.</p></li>
-<li><p>Put system includes in a section after the HotSpot include lines with a blank
-line separating the two sections.</p></li>
 <li><p>Do not put non-trivial function implementations in .hpp files. If
-the implementation depends on other .hpp files, put it in a .cpp or
-a .inline.hpp file.</p></li>
+the implementation depends on other .hpp files, put it in a .cpp or a
+.inline.hpp file.</p></li>
 <li><p>.inline.hpp files should only be included in .cpp or .inline.hpp
 files.</p></li>
-<li><p>All .inline.hpp files should include their corresponding .hpp file as
-the first include line with a blank line separating it from the rest of the
-include lines. Declarations needed by other files should be put in the .hpp
-file, and not in the .inline.hpp file. This rule exists to resolve problems
-with circular dependencies between .inline.hpp files.</p></li>
-<li><p>Do not include a .hpp file if the corresponding .inline.hpp file is included.</p></li>
-<li><p>Use include guards for .hpp and .inline.hpp files. The name of the defined
-guard should be derived from the full search path of the file relative to the
-hotspot source directory. The guard should be all upper case with all paths
-separators and periods replaced by underscores.</p></li>
+<li><p>All .inline.hpp files should include their corresponding .hpp
+file as the first include line. Declarations needed by other files
+should be put in the .hpp file, and not in the .inline.hpp file. This
+rule exists to resolve problems with circular dependencies between
+.inline.hpp files.</p></li>
 <li><p>Some build configurations use precompiled headers to speed up the
 build times. The precompiled headers are included in the precompiled.hpp
 file. Note that precompiled.hpp is just a build time optimization, so
 don't rely on it to resolve include problems.</p></li>
+<li><p>Keep the include lines alphabetically sorted.</p></li>
+<li><p>Put conditional inclusions (<code>#if ...</code>) at the end of
+the include list.</p></li>
 </ul>
 <h3 id="jtreg-tests">JTReg Tests</h3>
 <ul>

doc/hotspot-style.md

@@ -135,18 +135,9 @@ change should be done with a "setter" accessor matched to the simple
 
 ### Source Files
 
-* All source files must have a globally unique basename. The build
+* All source files must have a globally unique basename.  The build
 system depends on this uniqueness.
 
-* Keep the include lines within a section alphabetically sorted.
-
-* Put conditional inclusions (`#if ...`) at the end of the section of HotSpot
-include lines. This also applies to macro-expanded includes of platform
-dependent files.
-
-* Put system includes in a section after the HotSpot include lines with a blank
-line separating the two sections.
-
 * Do not put non-trivial function implementations in .hpp files. If
 the implementation depends on other .hpp files, put it in a .cpp or
 a .inline.hpp file.
@@ -155,23 +146,19 @@ a .inline.hpp file.
 files.
 
 * All .inline.hpp files should include their corresponding .hpp file as
-the first include line with a blank line separating it from the rest of the
-include lines. Declarations needed by other files should be put in the .hpp
-file, and not in the .inline.hpp file. This rule exists to resolve problems
-with circular dependencies between .inline.hpp files.
-
-* Do not include a .hpp file if the corresponding .inline.hpp file is included.
-
-* Use include guards for .hpp and .inline.hpp files. The name of the defined
-guard should be derived from the full search path of the file relative to the
-hotspot source directory. The guard should be all upper case with all paths
-separators and periods replaced by underscores.
+the first include line. Declarations needed by other files should be put
+in the .hpp file, and not in the .inline.hpp file. This rule exists to
+resolve problems with circular dependencies between .inline.hpp files.
 
 * Some build configurations use precompiled headers to speed up the
 build times. The precompiled headers are included in the precompiled.hpp
 file. Note that precompiled.hpp is just a build time optimization, so
 don't rely on it to resolve include problems.
 
+* Keep the include lines alphabetically sorted.
+
+* Put conditional inclusions (`#if ...`) at the end of the include list.
+
 ### JTReg Tests
 
 * JTReg tests should have meaningful names.

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

@@ -24,8 +24,6 @@ source jb/project/tools/common/scripts/common.sh
 
 JCEF_PATH=${JCEF_PATH:=./jcef_mac}
 BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 17)}
-XCODE_PATH=${XCODE_PATH:-}
-[ -d "$XCODE_PATH" ] && WITH_XCODE_PATH="--with-xcode-path=$XCODE_PATH" || WITH_XCODE_PATH=""
 
 function do_configure {
   sh configure \
@@ -44,7 +42,6 @@ function do_configure {
     $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
     $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    $WITH_XCODE_PATH \
     || do_exit $?
 }
 

make/RunTests.gmk

@@ -543,8 +543,8 @@ define SetupRunGtestTestBody
 	            print arr[0]; \
 	            found=1; \
 	          } \
-	       } \
-	       END { if (!found) print 0; }' \
+	          if (!found) { print 0; } \
+	      }' \
 	      $$($1_RESULT_FILE))) \
 	  $$(eval $1_FAILED := $$(shell $$(AWK) '/\[  FAILED  \] .* tests?, \
 	      listed below/ { print $$$$4 }' $$($1_RESULT_FILE))) \

make/autoconf/basic.m4

@@ -624,4 +624,10 @@ AC_DEFUN_ONCE([BASIC_POST_CONFIG_OUTPUT],
 
   # Make the compare script executable
   $CHMOD +x $OUTPUTDIR/compare.sh
+
+  # Copy the linker wrapper script for clang on AIX and make it executable
+  if test "x$TOOLCHAIN_TYPE" = xclang && test "x$OPENJDK_TARGET_OS" = xaix; then
+    $CP -f "$TOPDIR/make/scripts/aix/ld.sh" "$OUTPUTDIR/ld.sh"
+    $CHMOD +x "$OUTPUTDIR/ld.sh"
+  fi
 ])

make/autoconf/flags-ldflags.m4

@@ -78,8 +78,8 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
       fi
     fi
     if test "x$OPENJDK_TARGET_OS" = xaix; then
-      BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-blibpath:/usr/lib:lib -Wl,-bnoexpall \
-        -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k"
+      BASIC_LDFLAGS="-Wl,-b64 -Wl,-brtl -Wl,-bnorwexec -Wl,-bnolibpath -Wl,-bnoexpall \
+        -Wl,-bernotok -Wl,-bdatapsize:64k -Wl,-btextpsize:64k -Wl,-bstackpsize:64k -fuse-ld=$OUTPUTDIR/ld.sh"
       BASIC_LDFLAGS_JVM_ONLY="$BASIC_LDFLAGS_JVM_ONLY -Wl,-lC_r -Wl,-bbigtoc"
     fi
 
@@ -100,7 +100,7 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
   if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$TOOLCHAIN_TYPE" = xclang; then
     # FIXME: We should really generalize SET_SHARED_LIBRARY_ORIGIN instead.
     OS_LDFLAGS_JVM_ONLY="-Wl,-rpath,@loader_path/. -Wl,-rpath,@loader_path/.."
-    OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN -Wl,-reproducible"
+    OS_LDFLAGS="-mmacosx-version-min=$MACOSX_VERSION_MIN"
   fi
 
   # Setup debug level-dependent LDFLAGS

make/autoconf/libraries.m4

@@ -167,7 +167,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
 
   # Threading library
   if test "x$OPENJDK_TARGET_OS" = xlinux || test "x$OPENJDK_TARGET_OS" = xaix; then
-    BASIC_JVM_LIBS="$BASIC_JVM_LIBS $LIBPTHREAD"
+    BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread"
   fi
 
   # librt for legacy clock_gettime
@@ -225,28 +225,6 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
   AC_SUBST(LIBDL)
   LIBS="$save_LIBS"
 
-  # Setup posix pthread support
-  if test "x$OPENJDK_TARGET_OS" != "xwindows"; then
-    LIBPTHREAD="-lpthread"
-  else
-    LIBPTHREAD=""
-  fi
-  AC_SUBST(LIBPTHREAD)
-
-  # Setup libiconv flags and library
-  if test "x$OPENJDK_TARGET_OS" == "xaix" || test "x$OPENJDK_TARGET_OS" == "xmacosx"; then
-    ICONV_CFLAGS=
-    ICONV_LDFLAGS=
-    ICONV_LIBS=-liconv
-  else
-    ICONV_CFLAGS=
-    ICONV_LDFLAGS=
-    ICONV_LIBS=
-  fi
-  AC_SUBST(ICONV_CFLAGS)
-  AC_SUBST(ICONV_LDFLAGS)
-  AC_SUBST(ICONV_LIBS)
-
   # Control if libzip can use mmap. Available for purposes of overriding.
   LIBZIP_CAN_USE_MMAP=true
   AC_SUBST(LIBZIP_CAN_USE_MMAP)

make/autoconf/spec.gmk.template

@@ -144,7 +144,6 @@ endif
 
 LIBM := @LIBM@
 LIBDL := @LIBDL@
-LIBPTHREAD := @LIBPTHREAD@
 
 WINENV_ROOT := @WINENV_ROOT@
 WINENV_PREFIX := @WINENV_PREFIX@
@@ -427,9 +426,6 @@ LIBFFI_LIBS := @LIBFFI_LIBS@
 LIBFFI_CFLAGS := @LIBFFI_CFLAGS@
 ENABLE_LIBFFI_BUNDLING := @ENABLE_LIBFFI_BUNDLING@
 LIBFFI_LIB_FILE := @LIBFFI_LIB_FILE@
-ICONV_CFLAGS := @ICONV_CFLAGS@
-ICONV_LDFLAGS := @ICONV_LDFLAGS@
-ICONV_LIBS := @ICONV_LIBS@
 FILE_MACRO_CFLAGS := @FILE_MACRO_CFLAGS@
 REPRODUCIBLE_CFLAGS := @REPRODUCIBLE_CFLAGS@
 

make/conf/jib-profiles.js

@@ -1237,7 +1237,7 @@ var getJibProfilesDependencies = function (input, common) {
             organization: common.organization,
             ext: "tar.gz",
             revision: "9.0.0+1.0",
-            module: "graphviz-" + input.build_platform,
+            module: "graphviz-" + input.target_platform,
             configure_args: "DOT=" + input.get("graphviz", "install_path") + "/dot",
             environment_path: input.get("graphviz", "install_path")
         },

make/hotspot/lib/JvmFeatures.gmk

@@ -224,9 +224,11 @@ ifeq ($(call check-jvm-feature, opt-size), true)
       frame_ppc.cpp \
       frame_s390.cpp \
       frame_x86.cpp \
+      genCollectedHeap.cpp \
       generation.cpp \
       growableArray.cpp \
       handles.cpp \
+      hashtable.cpp \
       heap.cpp \
       icache.cpp \
       icache_arm.cpp \
@@ -244,6 +246,7 @@ ifeq ($(call check-jvm-feature, opt-size), true)
       linkResolver.cpp \
       klass.cpp \
       klassVtable.cpp \
+      markSweep.cpp \
       memRegion.cpp \
       memoryPool.cpp \
       method.cpp \

make/jdk/src/classes/build/tools/cldrconverter/Bundle.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -198,6 +198,7 @@ class Bundle {
         String[] cldrBundles = getCLDRPath().split(",");
 
         // myMap contains resources for id.
+        @SuppressWarnings("unchecked")
         Map<String, Object> myMap = new HashMap<>();
         int index;
         for (index = 0; index < cldrBundles.length; index++) {

make/jdk/src/classes/build/tools/cldrconverter/LDMLParseHandler.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2025, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -1079,6 +1079,7 @@ class LDMLParseHandler extends AbstractLDMLHandler<Object> {
     }
 
     @Override
+    @SuppressWarnings("fallthrough")
     public void endElement(String uri, String localName, String qName) throws SAXException {
         assert qName.equals(currentContainer.getqName()) : "current=" + currentContainer.getqName() + ", param=" + qName;
         switch (qName) {

make/modules/java.base/Gensrc.gmk

@@ -80,17 +80,16 @@ $(eval $(call SetupCompileProperties, SUN_UTIL, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
 ))
 
-$(eval $(call SetupCompileProperties, SECURITY_RESOURCES, \
-    SRC_DIRS := $(MODULE_SRC)/share/classes/sun/security/util/resources, \
-    CLASS := ListResourceBundle, \
-))
+TARGETS += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL)
 
-$(eval $(call SetupCompileProperties, KEYTOOL_RESOURCES, \
-    SRC_DIRS := $(MODULE_SRC)/share/classes/sun/security/tools/keytool/resources, \
-    CLASS := ListResourceBundle, \
-))
+# Some resources bundles are already present as java files but still need to be
+# copied to zh_HK locale.
+$(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
+    $(addprefix $(TOPDIR)/src/java.base/share/classes/, \
+        sun/security/util/AuthResources_zh_TW.java \
+        sun/security/util/Resources_zh_TW.java)))
 
-TARGETS += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL) $(SECURITY_RESOURCES) $(KEYTOOL_RESOURCES)
+TARGETS += $(COPY_ZH_HK)
 
 ################################################################################
 

make/modules/java.base/Lib.gmk

@@ -81,7 +81,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBNIO, \
     DISABLED_WARNINGS_clang_Net.c := unused-function unused-variable, \
     DISABLED_WARNINGS_clang_UnixNativeDispatcher.c := unused-variable, \
     JDK_LIBS := libjava libnet, \
-    LIBS_linux := $(LIBDL) $(LIBPTHREAD), \
+    LIBS_linux := $(LIBDL) -lpthread, \
     LIBS_aix := $(LIBDL), \
     LIBS_macosx := \
         -framework CoreFoundation \
@@ -124,7 +124,6 @@ ifeq ($(call isTargetOsType, unix), true)
       DISABLED_WARNINGS_clang_jsig.c := unused-but-set-variable, \
       LIBS_linux := $(LIBDL), \
       LIBS_aix := $(LIBDL), \
-      ONLY_EXPORTED := true, \
   ))
 
   TARGETS += $(BUILD_LIBJSIG)

make/modules/java.base/lib/CoreLibraries.gmk

@@ -188,7 +188,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJLI, \
         unused-function, \
     DISABLED_WARNINGS_clang_java_md_macosx.m := unused-variable, \
     LIBS_unix := $(LIBZ_LIBS), \
-    LIBS_linux := $(LIBDL) $(LIBPTHREAD), \
+    LIBS_linux := $(LIBDL) -lpthread, \
     LIBS_macosx := \
         -framework ApplicationServices \
         -framework Cocoa \

make/modules/java.desktop/lib/AwtLibraries.gmk

@@ -384,7 +384,7 @@ ifeq ($(call isTargetOs, windows macosx)+$(ENABLE_HEADLESS_ONLY), false+false)
       JDK_LIBS := libawt java.base:libjava, \
       LIBS_unix := $(LIBDL) $(LIBM) $(SPEECHD_LIBS) $(X_LIBS) -lX11 -lXext -lXi -lXrender \
           -lXtst, \
-      LIBS_linux := $(LIBPTHREAD), \
+      LIBS_linux := -lpthread, \
       STATIC_LIB_EXCLUDE_OBJS := $(LIBAWT_XAWT_STATIC_EXCLUDE_OBJS), \
   ))
 

make/modules/java.desktop/lib/ClientLibraries.gmk

@@ -237,11 +237,9 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       EXCLUDES := $(LIBSPLASHSCREEN_EXCLUDES), \
       OPTIMIZATION := SIZE, \
       CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
-          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS) \
-          $(ICONV_CFLAGS), \
+          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
       CXXFLAGS := $(LIBSPLASHSCREEN_CFLAGS) \
-          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS) \
-          $(ICONV_CFLAGS), \
+          $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \
       EXTRA_HEADER_DIRS := libxsplashscreen $(LIBSPLASHSCREEN_HEADER_DIRS), \
       DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
       DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
@@ -268,20 +266,19 @@ 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 := $(ICONV_LDFLAGS), \
       LDFLAGS_windows := -delayload:user32.dll, \
       JDK_LIBS_windows := java.base:libjava, \
       JDK_LIBS_macosx := libosxapp, \
-      LIBS := $(LIBSPLASHSCREEN_LIBS) $(ICONV_LIBS), \
-      LIBS_unix := $(LIBM) $(LIBPTHREAD), \
+      LIBS := $(LIBSPLASHSCREEN_LIBS), \
+      LIBS_unix := $(LIBM) -lpthread, \
       LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
-      LIBS_macosx := \
+      LIBS_macosx := -liconv \
           -framework ApplicationServices \
           -framework Cocoa \
           -framework Foundation \
           -framework Metal \
           -framework Security, \
-      LIBS_aix := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
+      LIBS_aix := $(LIBDL) -liconv $(X_LIBS) -lX11 -lXext, \
       LIBS_windows := delayimp.lib gdi32.lib kernel32.lib user32.lib, \
       STATIC_LIB_EXCLUDE_OBJS := $(LIBSPLASHSCREEN_STATIC_LIB_EXCLUDE_OBJS), \
   ))
@@ -366,7 +363,7 @@ else
 
   HARFBUZZ_DISABLED_WARNINGS_gcc := missing-field-initializers \
       strict-aliasing unused-result array-bounds parentheses \
-       unused-variable dangling-pointer
+       unused-variable
   # noexcept-type required for GCC 7 builds. Not required for GCC 8+.
   # expansion-to-defined required for GCC 9 builds. Not required for GCC 10+.
   # maybe-uninitialized required for GCC 8 builds. Not required for GCC 9+.

make/modules/java.instrument/Lib.gmk

@@ -35,17 +35,14 @@ include LibCommon.gmk
 $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
     NAME := instrument, \
     OPTIMIZATION := LOW, \
-    CFLAGS := $(ICONV_CFLAGS), \
     CFLAGS_windows := -Dstrcasecmp=stricmp, \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-    LDFLAGS := $(ICONV_LDFLAGS), \
     JDK_LIBS := java.base:libjava java.base:libjli java.base:libjvm, \
-    LIBS := $(ICONV_LIBS), \
     LIBS_unix := $(LIBZ_LIBS), \
     LIBS_linux := $(LIBDL), \
-    LIBS_aix := $(LIBDL), \
-    LIBS_macosx := \
+    LIBS_aix := $(LIBDL) -liconv, \
+    LIBS_macosx := -liconv \
         -framework ApplicationServices \
         -framework Cocoa \
         -framework Security, \

make/modules/java.management/Lib.gmk

@@ -31,9 +31,14 @@ include LibCommon.gmk
 ## Build libmanagement
 ################################################################################
 
+LIBMANAGEMENT_OPTIMIZATION := HIGH
+ifeq ($(call isTargetOs, linux)+$(COMPILE_WITH_DEBUG_SYMBOLS), true+true)
+  LIBMANAGEMENT_OPTIMIZATION := LOW
+endif
+
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT, \
     NAME := management, \
-    OPTIMIZATION := HIGH, \
+    OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
     DISABLED_WARNINGS_gcc_VMManagementImpl.c := unused-variable, \
     DISABLED_WARNINGS_clang_VMManagementImpl.c := unused-variable, \
     JDK_LIBS := java.base:libjava java.base:libjvm, \

make/modules/jdk.jartool/Gensrc.gmk

@@ -33,11 +33,6 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
     CLASS := ListResourceBundle, \
 ))
 
-$(eval $(call SetupCompileProperties, JARSIGNER_RESOURCES, \
-    SRC_DIRS := $(TOPDIR)/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/resources, \
-    CLASS := ListResourceBundle, \
-))
-
-TARGETS += $(COMPILE_PROPERTIES) $(JARSIGNER_RESOURCES)
+TARGETS += $(COMPILE_PROPERTIES)
 
 ################################################################################

make/modules/jdk.jdwp.agent/Lib.gmk

@@ -38,7 +38,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBDT_SOCKET, \
     EXTRA_HEADER_DIRS := \
         include \
         libjdwp/export, \
-    LIBS_linux := $(LIBPTHREAD), \
+    LIBS_linux := -lpthread, \
     LIBS_windows := iphlpapi.lib ws2_32.lib, \
 ))
 
@@ -53,7 +53,7 @@ TARGETS += $(BUILD_LIBDT_SOCKET)
 $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     NAME := jdwp, \
     OPTIMIZATION := LOW, \
-    CFLAGS := -DJDWP_LOGGING $(ICONV_CFLAGS), \
+    CFLAGS := -DJDWP_LOGGING, \
     DISABLED_WARNINGS_gcc_eventFilter.c := unused-variable, \
     DISABLED_WARNINGS_gcc_SDE.c := unused-function, \
     DISABLED_WARNINGS_gcc_threadControl.c := unused-but-set-variable \
@@ -68,14 +68,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJDWP, \
     DISABLED_WARNINGS_clang_threadControl.c := unused-but-set-variable \
         unused-variable, \
     DISABLED_WARNINGS_clang_utf_util.c := unused-but-set-variable, \
-    LDFLAGS := $(ICONV_LDFLAGS), \
     EXTRA_HEADER_DIRS := \
         include \
         libjdwp/export \
         java.base:libjava, \
     JDK_LIBS := java.base:libjvm, \
-    LIBS := $(ICONV_LIBS), \
     LIBS_linux := $(LIBDL), \
+    LIBS_macosx := -liconv, \
+    LIBS_aix := -liconv, \
 ))
 
 TARGETS += $(BUILD_LIBJDWP)

make/modules/jdk.management/Lib.gmk

@@ -38,9 +38,14 @@ ifeq ($(call isTargetOs, windows), true)
   LIBMANAGEMENT_EXT_CFLAGS := -DPSAPI_VERSION=1
 endif
 
+LIBMANAGEMENT_EXT_OPTIMIZATION := HIGH
+ifeq ($(call isTargetOs, linux)+$(COMPILE_WITH_DEBUG_SYMBOLS), true+true)
+  LIBMANAGEMENT_EXT_OPTIMIZATION := LOW
+endif
+
 $(eval $(call SetupJdkLibrary, BUILD_LIBMANAGEMENT_EXT, \
     NAME := management_ext, \
-    OPTIMIZATION := HIGH, \
+    OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
     DISABLED_WARNINGS_gcc_DiagnosticCommandImpl.c := unused-variable, \
     DISABLED_WARNINGS_clang_DiagnosticCommandImpl.c := unused-variable, \
     DISABLED_WARNINGS_clang_UnixOperatingSystem.c := format-nonliteral, \

make/modules/jdk.sctp/Lib.gmk

@@ -41,7 +41,7 @@ ifeq ($(call isTargetOs, linux), true)
           java.base:libnio \
           java.base:libnio/ch, \
       JDK_LIBS := java.base:libjava java.base:libnet, \
-      LIBS_linux := $(LIBDL) $(LIBPTHREAD), \
+      LIBS_linux := $(LIBDL) -lpthread, \
   ))
 
   TARGETS += $(BUILD_LIBSCTP)

make/scripts/aix/ld.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Copyright (c) 2025 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.  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.
+#
+unset LIBPATH
+exec /usr/bin/ld "$@"

src/hotspot/cpu/aarch64/aarch64.ad

@@ -1742,7 +1742,7 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
     st->print("mov  rscratch1, #%d\n\t", framesize - 2 * wordSize);
     st->print("sub  sp, sp, rscratch1");
   }
-  if (C->stub_function() == nullptr) {
+  if (C->stub_function() == nullptr && BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
     st->print("\n\t");
     st->print("ldr  rscratch1, [guard]\n\t");
     st->print("dmb ishld\n\t");
@@ -1792,23 +1792,25 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
 
   if (C->stub_function() == nullptr) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    // Dummy labels for just measuring the code size
-    Label dummy_slow_path;
-    Label dummy_continuation;
-    Label dummy_guard;
-    Label* slow_path = &dummy_slow_path;
-    Label* continuation = &dummy_continuation;
-    Label* guard = &dummy_guard;
-    if (!Compile::current()->output()->in_scratch_emit_size()) {
-      // Use real labels from actual stub when not emitting code for the purpose of measuring its size
-      C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
-      Compile::current()->output()->add_stub(stub);
-      slow_path = &stub->entry();
-      continuation = &stub->continuation();
-      guard = &stub->guard();
+    if (BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
+      // Dummy labels for just measuring the code size
+      Label dummy_slow_path;
+      Label dummy_continuation;
+      Label dummy_guard;
+      Label* slow_path = &dummy_slow_path;
+      Label* continuation = &dummy_continuation;
+      Label* guard = &dummy_guard;
+      if (!Compile::current()->output()->in_scratch_emit_size()) {
+        // Use real labels from actual stub when not emitting code for the purpose of measuring its size
+        C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
+        Compile::current()->output()->add_stub(stub);
+        slow_path = &stub->entry();
+        continuation = &stub->continuation();
+        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);
     }
-    // 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);
   }
 
   if (VerifyStackAtCalls) {
@@ -4539,7 +4541,6 @@ operand immByteMapBase()
 %{
   // Get base of card map
   predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
-            SHENANDOAHGC_ONLY(!BarrierSet::barrier_set()->is_a(BarrierSet::ShenandoahBarrierSet) &&)
             (CardTable::CardValue*)n->get_ptr() == ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
   match(ConP);
 

src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp

@@ -312,8 +312,10 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg, Registe
   // StoreLoad achieves this.
   membar(StoreLoad);
 
-  // Check if the entry_list is empty.
-  ldr(rscratch1, Address(tmp, ObjectMonitor::entry_list_offset()));
+  // Check if the entry lists are empty (EntryList first - by convention).
+  ldr(rscratch1, Address(tmp, ObjectMonitor::EntryList_offset()));
+  ldr(tmpReg, Address(tmp, ObjectMonitor::cxq_offset()));
+  orr(rscratch1, rscratch1, tmpReg);
   cmp(rscratch1, zr);
   br(Assembler::EQ, cont);     // If so we are done.
 
@@ -633,8 +635,10 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box, Regi
     // StoreLoad achieves this.
     membar(StoreLoad);
 
-    // Check if the entry_list is empty.
-    ldr(rscratch1, Address(t1_monitor, ObjectMonitor::entry_list_offset()));
+    // Check if the entry lists are empty (EntryList first - by convention).
+    ldr(rscratch1, Address(t1_monitor, ObjectMonitor::EntryList_offset()));
+    ldr(t3_t, Address(t1_monitor, ObjectMonitor::cxq_offset()));
+    orr(rscratch1, rscratch1, t3_t);
     cmp(rscratch1, zr);
     br(Assembler::EQ, unlocked);  // If so we are done.
 

src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp

@@ -285,6 +285,10 @@ void BarrierSetAssembler::clear_patching_epoch() {
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slow_path, Label* continuation, Label* guard) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
 
+  if (bs_nm == nullptr) {
+    return;
+  }
+
   Label local_guard;
   Label skip_barrier;
   NMethodPatchingType patching_type = nmethod_patching_type();
@@ -357,6 +361,11 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slo
 }
 
 void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
+  BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs == nullptr) {
+    return;
+  }
+
   Label bad_call;
   __ cbz(rmethod, bad_call);
 

src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp

@@ -377,8 +377,7 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 
   assert(CardTable::dirty_card_val() == 0, "must be");
 
-  Address curr_ct_holder_addr(rthread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
-  __ ldr(rscratch1, curr_ct_holder_addr);
+  __ load_byte_map_base(rscratch1);
 
   if (UseCondCardMark) {
     Label L_already_dirty;
@@ -625,8 +624,7 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   // number of bytes to copy
   __ sub(count, end, start);
 
-  Address curr_ct_holder_addr(rthread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
-  __ ldr(scratch, curr_ct_holder_addr);
+  __ load_byte_map_base(scratch);
   __ add(start, start, scratch);
   __ bind(L_loop);
   __ strb(zr, Address(start, count));

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -9900,7 +9900,10 @@ class StubGenerator: public StubCodeGenerator {
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+    if (bs_nm != nullptr) {
+      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    }
 
     StubRoutines::aarch64::_spin_wait = generate_spin_wait();
 

src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp

@@ -2102,7 +2102,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 
 void TemplateInterpreterGenerator::count_bytecode() {
   __ mov(r10, (address) &BytecodeCounter::_counter_value);
-  __ atomic_add(noreg, 1, r10);
+  __ atomic_addw(noreg, 1, r10);
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
@@ -2150,7 +2150,7 @@ void TemplateInterpreterGenerator::stop_interpreter_at() {
   __ mov(rscratch1, (address) &BytecodeCounter::_counter_value);
   __ ldr(rscratch1, Address(rscratch1));
   __ mov(rscratch2, StopInterpreterAt);
-  __ cmp(rscratch1, rscratch2);
+  __ cmpw(rscratch1, rscratch2);
   __ br(Assembler::NE, L);
   __ brk(0);
   __ bind(L);

src/hotspot/cpu/arm/arm.ad

@@ -286,7 +286,7 @@ void MachPrologNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
     st->print   ("SUB    R_SP, R_SP, %zu", framesize);
   }
 
-  if (C->stub_function() == nullptr) {
+  if (C->stub_function() == nullptr && BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
     st->print("ldr t0, [guard]\n\t");
     st->print("ldr t1, [Rthread, #thread_disarmed_guard_value_offset]\n\t");
     st->print("cmp t0, t1\n\t");

src/hotspot/cpu/arm/gc/shared/barrierSetAssembler_arm.cpp

@@ -169,6 +169,10 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
   Register tmp0 = Rtemp;
   Register tmp1 = R5; // must be callee-save register
 
+  if (bs_nm == nullptr) {
+    return;
+  }
+
   // The are no GCs that require memory barrier on arm32 now
 #ifdef ASSERT
   NMethodPatchingType patching_type = nmethod_patching_type();

src/hotspot/cpu/arm/stubGenerator_arm.cpp

@@ -3176,7 +3176,11 @@ class StubGenerator: public StubCodeGenerator {
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+    if (bs_nm != nullptr) {
+      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    }
+
   }
 
   void generate_compiler_stubs() {

src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp

@@ -181,6 +181,10 @@ void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Re
 
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Register tmp) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm == nullptr) {
+    return;
+  }
+
   assert_different_registers(tmp, R0);
 
   __ block_comment("nmethod_entry_barrier (nmethod_entry_barrier) {");
@@ -211,6 +215,11 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Register t
 }
 
 void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler *masm, Register tmp1, Register tmp2, Register tmp3) {
+  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm == nullptr) {
+    return;
+  }
+
   assert_different_registers(tmp1, tmp2, tmp3);
 
   __ block_comment("c2i_entry_barrier (c2i_entry_barrier) {");

src/hotspot/cpu/ppc/gc/shenandoah/shenandoahBarrierSetAssembler_ppc.cpp

@@ -587,6 +587,9 @@ void ShenandoahBarrierSetAssembler::load_at(
 
 void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register base, RegisterOrConstant ind_or_offs, Register tmp) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
+
+  ShenandoahBarrierSet* ctbs = ShenandoahBarrierSet::barrier_set();
+  CardTable* ct = ctbs->card_table();
   assert_different_registers(base, tmp, R0);
 
   if (ind_or_offs.is_constant()) {
@@ -595,7 +598,7 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register b
     __ add(base, ind_or_offs.as_register(), base);
   }
 
-  __ ld(tmp, in_bytes(ShenandoahThreadLocalData::card_table_offset()), R16_thread); /* tmp = *[R16_thread + card_table_offset] */
+  __ load_const_optimized(tmp, (address)ct->byte_map_base(), R0);
   __ srdi(base, base, CardTable::card_shift());
   __ li(R0, CardTable::dirty_card_val());
   __ stbx(R0, tmp, base);
@@ -794,8 +797,7 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   __ srdi(addr, addr, CardTable::card_shift());
   __ srdi(count, count, CardTable::card_shift());
   __ subf(count, addr, count);
-  __ ld(R0, in_bytes(ShenandoahThreadLocalData::card_table_offset()), R16_thread);
-  __ add(addr, addr, R0);
+  __ add_const_optimized(addr, addr, (address)ct->byte_map_base(), R0);
   __ addi(count, count, 1);
   __ li(R0, 0);
   __ mtctr(count);

src/hotspot/cpu/ppc/macroAssembler_ppc.cpp

@@ -2958,8 +2958,10 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
   // StoreLoad achieves this.
   membar(StoreLoad);
 
-  // Check if the entry_list is empty.
-  ld(temp, in_bytes(ObjectMonitor::entry_list_offset()), current_header);
+  // Check if the entry lists are empty (EntryList first - by convention).
+  ld(temp,             in_bytes(ObjectMonitor::EntryList_offset()), current_header);
+  ld(displaced_header, in_bytes(ObjectMonitor::cxq_offset()), current_header);
+  orr(temp, temp, displaced_header); // Will be 0 if both are 0.
   cmpdi(flag, temp, 0);
   beq(flag, success);  // If so we are done.
 
@@ -3297,6 +3299,8 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
 
     bind(not_recursive);
 
+    const Register t2 = tmp2;
+
     // Set owner to null.
     // Release to satisfy the JMM
     release();
@@ -3306,8 +3310,10 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
     // StoreLoad achieves this.
     membar(StoreLoad);
 
-    // Check if the entry_list is empty.
-    ld(t, in_bytes(ObjectMonitor::entry_list_offset()), monitor);
+    // Check if the entry lists are empty (EntryList first - by convention).
+    ld(t, in_bytes(ObjectMonitor::EntryList_offset()), monitor);
+    ld(t2, in_bytes(ObjectMonitor::cxq_offset()), monitor);
+    orr(t, t, t2);
     cmpdi(CR0, t, 0);
     beq(CR0, unlocked); // If so we are done.
 

src/hotspot/cpu/ppc/stubGenerator_ppc.cpp

@@ -4881,7 +4881,10 @@ void generate_lookup_secondary_supers_table_stub() {
     StubRoutines::_verify_oop_subroutine_entry             = generate_verify_oop();
 
     // nmethod entry barriers for concurrent class unloading
-    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+    if (bs_nm != nullptr) {
+      StubRoutines::_method_entry_barrier            = generate_method_entry_barrier();
+    }
 
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();

src/hotspot/cpu/ppc/templateInterpreterGenerator_ppc.cpp

@@ -1996,20 +1996,8 @@ address TemplateInterpreterGenerator::generate_CRC32C_updateBytes_entry(Abstract
   return start;
 }
 
-address TemplateInterpreterGenerator::generate_currentThread() {
-  address entry_point = __ pc();
-
-  __ ld(R3_RET, JavaThread::vthread_offset(), R16_thread);
-  __ resolve_oop_handle(R3_RET, R11_scratch1, R12_scratch2, MacroAssembler::PRESERVATION_FRAME_LR);
-
-  // restore caller sp for c2i case (from compiled) and for resized sender frame (from interpreted).
-  __ resize_frame_absolute(R21_sender_SP, R11_scratch1, R0);
-  __ blr();
-
-  return entry_point;
-}
-
 // Not supported
+address TemplateInterpreterGenerator::generate_currentThread() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_intBitsToFloat_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Float_floatToRawIntBits_entry() { return nullptr; }
 address TemplateInterpreterGenerator::generate_Double_longBitsToDouble_entry() { return nullptr; }
@@ -2328,11 +2316,11 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
   // Support short-cut for TraceBytecodesAt.
   // Don't call into the VM if we don't want to trace to speed up things.
   Label Lskip_vm_call;
-  if (TraceBytecodesAt > 0) {
+  if (TraceBytecodesAt > 0 && TraceBytecodesAt < max_intx) {
     int offs1 = __ load_const_optimized(R11_scratch1, (address) &TraceBytecodesAt, R0, true);
     int offs2 = __ load_const_optimized(R12_scratch2, (address) &BytecodeCounter::_counter_value, R0, true);
     __ ld(R11_scratch1, offs1, R11_scratch1);
-    __ ld(R12_scratch2, offs2, R12_scratch2);
+    __ lwa(R12_scratch2, offs2, R12_scratch2);
     __ cmpd(CR0, R12_scratch2, R11_scratch1);
     __ blt(CR0, Lskip_vm_call);
   }
@@ -2346,7 +2334,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
   __ mtlr(R31);
   __ pop(state);
 
-  if (TraceBytecodesAt > 0) {
+  if (TraceBytecodesAt > 0 && TraceBytecodesAt < max_intx) {
     __ bind(Lskip_vm_call);
   }
   __ blr();
@@ -2356,9 +2344,9 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 
 void TemplateInterpreterGenerator::count_bytecode() {
   int offs = __ load_const_optimized(R11_scratch1, (address) &BytecodeCounter::_counter_value, R12_scratch2, true);
-  __ ld(R12_scratch2, offs, R11_scratch1);
+  __ lwz(R12_scratch2, offs, R11_scratch1);
   __ addi(R12_scratch2, R12_scratch2, 1);
-  __ std(R12_scratch2, offs, R11_scratch1);
+  __ stw(R12_scratch2, offs, R11_scratch1);
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
@@ -2407,7 +2395,7 @@ void TemplateInterpreterGenerator::stop_interpreter_at() {
   int offs1 = __ load_const_optimized(R11_scratch1, (address) &StopInterpreterAt, R0, true);
   int offs2 = __ load_const_optimized(R12_scratch2, (address) &BytecodeCounter::_counter_value, R0, true);
   __ ld(R11_scratch1, offs1, R11_scratch1);
-  __ ld(R12_scratch2, offs2, R12_scratch2);
+  __ lwa(R12_scratch2, offs2, R12_scratch2);
   __ cmpd(CR0, R12_scratch2, R11_scratch1);
   __ bne(CR0, L);
   __ illtrap();

src/hotspot/cpu/riscv/assembler_riscv.hpp

@@ -1316,7 +1316,6 @@ enum operand_size { int8, int16, int32, uint32, int64 };
 
  public:
 
-  void  flh(FloatRegister Rd, Register Rs, const int32_t offset) { fp_load<0b001>(Rd, Rs, offset); }
   void  flw(FloatRegister Rd, Register Rs, const int32_t offset) { fp_load<0b010>(Rd, Rs, offset); }
   void _fld(FloatRegister Rd, Register Rs, const int32_t offset) { fp_load<0b011>(Rd, Rs, offset); }
 
@@ -1398,46 +1397,6 @@ enum operand_size { int8, int16, int32, uint32, int64 };
     fp_base<H_16_hp, 0b11100>(Rd, Rs1, 0b00000, 0b000);
   }
 
-  void fadd_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {
-    assert_cond(UseZfh);
-    fp_base<H_16_hp, 0b00000>(Rd, Rs1, Rs2, rm);
-  }
-
-  void fsub_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {
-    assert_cond(UseZfh);
-    fp_base<H_16_hp, 0b00001>(Rd, Rs1, Rs2, rm);
-  }
-
-  void fmul_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {
-    assert_cond(UseZfh);
-    fp_base<H_16_hp, 0b00010>(Rd, Rs1, Rs2, rm);
-  }
-
-  void fdiv_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, RoundingMode rm = rne) {
-    assert_cond(UseZfh);
-    fp_base<H_16_hp, 0b00011>(Rd, Rs1, Rs2, rm);
-  }
-
-  void fsqrt_h(FloatRegister Rd, FloatRegister Rs1, RoundingMode rm = rne) {
-    assert_cond(UseZfh);
-    fp_base<H_16_hp, 0b01011>(Rd, Rs1, 0b00000, rm);
-  }
-
-  void fmin_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
-    assert_cond(UseZfh);
-    fp_base<H_16_hp, 0b00101>(Rd, Rs1, Rs2, 0b000);
-  }
-
-  void fmax_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2) {
-    assert_cond(UseZfh);
-    fp_base<H_16_hp, 0b00101>(Rd, Rs1, Rs2, 0b001);
-  }
-
-  void fmadd_h(FloatRegister Rd, FloatRegister Rs1, FloatRegister Rs2, FloatRegister Rs3, RoundingMode rm = rne)  {
-    assert_cond(UseZfh);
-    fp_fm<H_16_hp, 0b1000011>(Rd, Rs1, Rs2, Rs3, rm);
-  }
-
 // --------------  ZFA Instruction Definitions  --------------
 // Zfa Extension for Additional Floating-Point Instructions
   void _fli_s(FloatRegister Rd, uint8_t Rs1) {

src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.cpp

@@ -233,8 +233,10 @@ void C2_MacroAssembler::fast_unlock(Register objectReg, Register boxReg,
   // StoreLoad achieves this.
   membar(StoreLoad);
 
-  // Check if the entry_list is empty.
-  ld(t0, Address(tmp, ObjectMonitor::entry_list_offset()));
+  // Check if the entry lists are empty (EntryList first - by convention).
+  ld(t0, Address(tmp, ObjectMonitor::EntryList_offset()));
+  ld(tmp1Reg, Address(tmp, ObjectMonitor::cxq_offset()));
+  orr(t0, t0, tmp1Reg);
   beqz(t0, unlocked); // If so we are done.
 
   // Check if there is a successor.
@@ -567,8 +569,10 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register box,
     // StoreLoad achieves this.
     membar(StoreLoad);
 
-    // Check if the entry_list is empty.
-    ld(t0, Address(tmp1_monitor, ObjectMonitor::entry_list_offset()));
+    // Check if the entry lists are empty (EntryList first - by convention).
+    ld(t0, Address(tmp1_monitor, ObjectMonitor::EntryList_offset()));
+    ld(tmp3_t, Address(tmp1_monitor, ObjectMonitor::cxq_offset()));
+    orr(t0, t0, tmp3_t);
     beqz(t0, unlocked); // If so we are done.
 
     // Check if there is a successor.
@@ -1385,7 +1389,8 @@ void C2_MacroAssembler::string_compare_long_same_encoding(Register result, Regis
                                                   const int STUB_THRESHOLD, Label *STUB, Label *SHORT_STRING, Label *DONE) {
   Label TAIL_CHECK, TAIL, NEXT_WORD, DIFFERENCE;
 
-  const int base_offset = arrayOopDesc::base_offset_in_bytes(T_BYTE);
+  const int base_offset = isLL ? arrayOopDesc::base_offset_in_bytes(T_BYTE)
+                               : arrayOopDesc::base_offset_in_bytes(T_CHAR);
   assert((base_offset % (UseCompactObjectHeaders ? 4 :
                         (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
 
@@ -1479,7 +1484,7 @@ void C2_MacroAssembler::string_compare_long_different_encoding(Register result,
                                                const int STUB_THRESHOLD, Label *STUB, Label *DONE) {
   Label TAIL, NEXT_WORD, DIFFERENCE;
 
-  const int base_offset = arrayOopDesc::base_offset_in_bytes(T_BYTE);
+  const int base_offset = arrayOopDesc::base_offset_in_bytes(T_CHAR);
   assert((base_offset % (UseCompactObjectHeaders ? 4 :
                           (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
 
@@ -2158,68 +2163,27 @@ void C2_MacroAssembler::enc_cmove(int cmpFlag, Register op1, Register op2, Regis
 
 // Set dst to NaN if any NaN input.
 void C2_MacroAssembler::minmax_fp(FloatRegister dst, FloatRegister src1, FloatRegister src2,
-                                  FLOAT_TYPE ft, bool is_min) {
-  assert_cond((ft != FLOAT_TYPE::half_precision) || UseZfh);
-
+                                  bool is_double, bool is_min) {
   Label Done, Compare;
 
-  switch (ft) {
-    case FLOAT_TYPE::half_precision:
-      fclass_h(t0, src1);
-      fclass_h(t1, src2);
+  is_double ? fclass_d(t0, src1)
+            : fclass_s(t0, src1);
+  is_double ? fclass_d(t1, src2)
+            : fclass_s(t1, src2);
+  orr(t0, t0, t1);
+  andi(t0, t0, FClassBits::nan); // if src1 or src2 is quiet or signaling NaN then return NaN
+  beqz(t0, Compare);
+  is_double ? fadd_d(dst, src1, src2)
+            : fadd_s(dst, src1, src2);
+  j(Done);
 
-      orr(t0, t0, t1);
-      andi(t0, t0, FClassBits::nan); // if src1 or src2 is quiet or signaling NaN then return NaN
-      beqz(t0, Compare);
-
-      fadd_h(dst, src1, src2);
-      j(Done);
-
-      bind(Compare);
-      if (is_min) {
-        fmin_h(dst, src1, src2);
-      } else {
-        fmax_h(dst, src1, src2);
-      }
-      break;
-    case FLOAT_TYPE::single_precision:
-      fclass_s(t0, src1);
-      fclass_s(t1, src2);
-
-      orr(t0, t0, t1);
-      andi(t0, t0, FClassBits::nan); // if src1 or src2 is quiet or signaling NaN then return NaN
-      beqz(t0, Compare);
-
-      fadd_s(dst, src1, src2);
-      j(Done);
-
-      bind(Compare);
-      if (is_min) {
-        fmin_s(dst, src1, src2);
-      } else {
-        fmax_s(dst, src1, src2);
-      }
-      break;
-    case FLOAT_TYPE::double_precision:
-      fclass_d(t0, src1);
-      fclass_d(t1, src2);
-
-      orr(t0, t0, t1);
-      andi(t0, t0, FClassBits::nan); // if src1 or src2 is quiet or signaling NaN then return NaN
-      beqz(t0, Compare);
-
-      fadd_d(dst, src1, src2);
-      j(Done);
-
-      bind(Compare);
-      if (is_min) {
-        fmin_d(dst, src1, src2);
-      } else {
-        fmax_d(dst, src1, src2);
-      }
-      break;
-    default:
-      ShouldNotReachHere();
+  bind(Compare);
+  if (is_double) {
+    is_min ? fmin_d(dst, src1, src2)
+           : fmax_d(dst, src1, src2);
+  } else {
+    is_min ? fmin_s(dst, src1, src2)
+           : fmax_s(dst, src1, src2);
   }
 
   bind(Done);
@@ -2654,9 +2618,6 @@ void C2_MacroAssembler::clear_array_v(Register base, Register cnt) {
 
 void C2_MacroAssembler::arrays_equals_v(Register a1, Register a2, Register result,
                                         Register cnt1, int elem_size) {
-  assert(elem_size == 1 || elem_size == 2, "must be char or byte");
-  assert_different_registers(a1, a2, result, cnt1, t0, t1);
-
   Label DONE;
   Register tmp1 = t0;
   Register tmp2 = t1;

src/hotspot/cpu/riscv/c2_MacroAssembler_riscv.hpp

@@ -172,15 +172,9 @@
     }
   }
 
-  enum class FLOAT_TYPE {
-    half_precision,
-    single_precision,
-    double_precision
-  };
-
   void minmax_fp(FloatRegister dst,
                  FloatRegister src1, FloatRegister src2,
-                 FLOAT_TYPE ft, bool is_min);
+                 bool is_double, bool is_min);
 
   void round_double_mode(FloatRegister dst, FloatRegister src, int round_mode,
                          Register tmp1, Register tmp2, Register tmp3);

src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp

@@ -226,6 +226,11 @@ void BarrierSetAssembler::clear_patching_epoch() {
 
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slow_path, Label* continuation, Label* guard) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+
+  if (bs_nm == nullptr) {
+    return;
+  }
+
   Assembler::IncompressibleRegion ir(masm);  // Fixed length: see entry_barrier_offset()
 
   Label local_guard;
@@ -315,6 +320,11 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slo
 }
 
 void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
+  BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs == nullptr) {
+    return;
+  }
+
   Label bad_call;
   __ beqz(xmethod, bad_call);
 

src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.cpp

@@ -396,8 +396,7 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 
   assert(CardTable::dirty_card_val() == 0, "must be");
 
-  Address curr_ct_holder_addr(xthread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
-  __ ld(t1, curr_ct_holder_addr);
+  __ load_byte_map_base(t1);
   __ add(t1, obj, t1);
 
   if (UseCondCardMark) {
@@ -569,8 +568,7 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   // number of bytes to copy
   __ sub(count, end, start);
 
-  Address curr_ct_holder_addr(xthread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
-  __ ld(tmp, curr_ct_holder_addr);
+  __ load_byte_map_base(tmp);
   __ add(start, start, tmp);
 
   __ bind(L_loop);

src/hotspot/cpu/riscv/macroAssembler_riscv.cpp

@@ -2892,6 +2892,7 @@ void MacroAssembler::revb(Register Rd, Register Rs, Register tmp1, Register tmp2
     slli(tmp1, tmp1, 8);
   }
   srli(Rd, Rs, 56);
+  zext(Rd, Rd, 8);
   orr(Rd, tmp1, Rd);
 }
 

src/hotspot/cpu/riscv/macroAssembler_riscv.hpp

@@ -1080,7 +1080,6 @@ public:
     }                                                                                              \
   }
 
-  INSN(flh);
   INSN(flw);
   INSN(fld);
 

src/hotspot/cpu/riscv/riscv.ad

@@ -1348,7 +1348,7 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
   if (PreserveFramePointer) { st->print("sub  fp, sp, #%d\n\t", 2 * wordSize); }
   st->print("sub sp, sp, #%d\n\t", framesize);
 
-  if (C->stub_function() == nullptr) {
+  if (C->stub_function() == nullptr && BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
     st->print("ld  t0, [guard]\n\t");
     st->print("membar LoadLoad\n\t");
     st->print("ld  t1, [xthread, #thread_disarmed_guard_value_offset]\n\t");
@@ -1398,23 +1398,25 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
 
   if (C->stub_function() == nullptr) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
-    // Dummy labels for just measuring the code size
-    Label dummy_slow_path;
-    Label dummy_continuation;
-    Label dummy_guard;
-    Label* slow_path = &dummy_slow_path;
-    Label* continuation = &dummy_continuation;
-    Label* guard = &dummy_guard;
-    if (!Compile::current()->output()->in_scratch_emit_size()) {
-      // Use real labels from actual stub when not emitting code for purpose of measuring its size
-      C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
-      Compile::current()->output()->add_stub(stub);
-      slow_path = &stub->entry();
-      continuation = &stub->continuation();
-      guard = &stub->guard();
+    if (BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
+      // Dummy labels for just measuring the code size
+      Label dummy_slow_path;
+      Label dummy_continuation;
+      Label dummy_guard;
+      Label* slow_path = &dummy_slow_path;
+      Label* continuation = &dummy_continuation;
+      Label* guard = &dummy_guard;
+      if (!Compile::current()->output()->in_scratch_emit_size()) {
+        // Use real labels from actual stub when not emitting code for purpose of measuring its size
+        C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
+        Compile::current()->output()->add_stub(stub);
+        slow_path = &stub->entry();
+        continuation = &stub->continuation();
+        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);
     }
-    // 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);
   }
 
   if (VerifyStackAtCalls) {
@@ -1916,19 +1918,7 @@ bool Matcher::match_rule_supported(int opcode) {
 
     case Op_ConvHF2F:
     case Op_ConvF2HF:
-      return VM_Version::supports_float16_float_conversion();
-    case Op_ReinterpretS2HF:
-    case Op_ReinterpretHF2S:
       return UseZfh || UseZfhmin;
-    case Op_AddHF:
-    case Op_DivHF:
-    case Op_FmaHF:
-    case Op_MaxHF:
-    case Op_MinHF:
-    case Op_MulHF:
-    case Op_SubHF:
-    case Op_SqrtHF:
-      return UseZfh;
   }
 
   return true; // Per default match rules are supported.
@@ -2926,7 +2916,6 @@ operand immByteMapBase()
 %{
   // Get base of card map
   predicate(BarrierSet::barrier_set()->is_a(BarrierSet::CardTableBarrierSet) &&
-            SHENANDOAHGC_ONLY(!BarrierSet::barrier_set()->is_a(BarrierSet::ShenandoahBarrierSet) &&)
             (CardTable::CardValue*)n->get_ptr() ==
              ((CardTableBarrierSet*)(BarrierSet::barrier_set()))->card_table()->byte_map_base());
   match(ConP);
@@ -3068,27 +3057,6 @@ operand immF0()
   interface(CONST_INTER);
 %}
 
-// Half Float Immediate
-operand immH()
-%{
-  match(ConH);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
-// Half Float Immediate: +0.0f.
-operand immH0()
-%{
-  predicate(jint_cast(n->geth()) == 0);
-  match(ConH);
-
-  op_cost(0);
-  format %{ %}
-  interface(CONST_INTER);
-%}
-
 operand immIOffset()
 %{
   predicate(Assembler::is_simm12(n->get_int()));
@@ -4940,39 +4908,6 @@ instruct loadConNKlass(iRegNNoSp dst, immNKlass con)
   ins_pipe(ialu_imm);
 %}
 
-// Load Half Float Constant
-instruct loadConH(fRegF dst, immH con) %{
-  match(Set dst con);
-
-  ins_cost(LOAD_COST);
-  format %{
-    "flh $dst, [$constantaddress]\t# load from constant table: float=$con, #@loadConH"
-  %}
-
-  ins_encode %{
-    assert(UseZfh || UseZfhmin, "must");
-    __ flh(as_FloatRegister($dst$$reg), $constantaddress($con));
-    // TODO: add zfa instructions for half float, and optimize here.
-  %}
-
-  ins_pipe(fp_load_constant_s);
-%}
-
-instruct loadConH0(fRegF dst, immH0 con) %{
-  match(Set dst con);
-
-  ins_cost(XFER_COST);
-
-  format %{ "fmv.h.x $dst, zr\t# float, #@loadConH0" %}
-
-  ins_encode %{
-    assert(UseZfh || UseZfhmin, "must");
-    __ fmv_h_x(as_FloatRegister($dst$$reg), zr);
-  %}
-
-  ins_pipe(fp_load_constant_s);
-%}
-
 // Load Float Constant
 instruct loadConF(fRegF dst, immF con) %{
   match(Set dst con);
@@ -7357,7 +7292,7 @@ instruct maxF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
   ins_encode %{
     __ minmax_fp(as_FloatRegister($dst$$reg),
                  as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
-                 __ FLOAT_TYPE::single_precision, false /* is_min */);
+                 false /* is_double */, false /* is_min */);
   %}
 
   ins_pipe(pipe_class_default);
@@ -7373,7 +7308,7 @@ instruct minF_reg_reg(fRegF dst, fRegF src1, fRegF src2, rFlagsReg cr) %{
   ins_encode %{
     __ minmax_fp(as_FloatRegister($dst$$reg),
                  as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
-                 __ FLOAT_TYPE::single_precision, true /* is_min */);
+                 false /* is_double */, true /* is_min */);
   %}
 
   ins_pipe(pipe_class_default);
@@ -7389,7 +7324,7 @@ instruct maxD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
   ins_encode %{
     __ minmax_fp(as_FloatRegister($dst$$reg),
                  as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
-                 __ FLOAT_TYPE::double_precision, false /* is_min */);
+                 true /* is_double */, false /* is_min */);
   %}
 
   ins_pipe(pipe_class_default);
@@ -7405,7 +7340,7 @@ instruct minD_reg_reg(fRegD dst, fRegD src1, fRegD src2, rFlagsReg cr) %{
   ins_encode %{
     __ minmax_fp(as_FloatRegister($dst$$reg),
                  as_FloatRegister($src1$$reg), as_FloatRegister($src2$$reg),
-                 __ FLOAT_TYPE::double_precision, true /* is_min */);
+                 true /* is_double */, true /* is_min */);
   %}
 
   ins_pipe(pipe_class_default);
@@ -8075,17 +8010,6 @@ instruct checkCastPP(iRegPNoSp dst)
   ins_pipe(pipe_class_empty);
 %}
 
-instruct castHH(fRegF dst)
-%{
-  match(Set dst (CastHH dst));
-
-  size(0);
-  format %{ "# castHH of $dst" %}
-  ins_encode(/* empty encoding */);
-  ins_cost(0);
-  ins_pipe(pipe_class_empty);
-%}
-
 instruct castFF(fRegF dst)
 %{
   match(Set dst (CastFF dst));
@@ -8248,108 +8172,6 @@ instruct convF2HF_reg_reg(iRegINoSp dst, fRegF src, fRegF ftmp, iRegINoSp xtmp)
   ins_pipe(pipe_slow);
 %}
 
-// half precision operations
-
-instruct reinterpretS2HF(fRegF dst, iRegI src)
-%{
-  match(Set dst (ReinterpretS2HF src));
-  format %{ "fmv.h.x $dst, $src" %}
-  ins_encode %{
-    __ fmv_h_x($dst$$FloatRegister, $src$$Register);
-  %}
-  ins_pipe(fp_i2f);
-%}
-
-instruct convF2HFAndS2HF(fRegF dst, fRegF src)
-%{
-  match(Set dst (ReinterpretS2HF (ConvF2HF src)));
-  format %{ "convF2HFAndS2HF $dst, $src" %}
-  ins_encode %{
-    __ fcvt_h_s($dst$$FloatRegister, $src$$FloatRegister);
-  %}
-  ins_pipe(fp_uop_s);
-%}
-
-instruct reinterpretHF2S(iRegINoSp dst, fRegF src)
-%{
-  match(Set dst (ReinterpretHF2S src));
-  format %{ "fmv.x.h $dst, $src" %}
-  ins_encode %{
-    __ fmv_x_h($dst$$Register, $src$$FloatRegister);
-  %}
-  ins_pipe(fp_f2i);
-%}
-
-instruct convHF2SAndHF2F(fRegF dst, fRegF src)
-%{
-  match(Set dst (ConvHF2F (ReinterpretHF2S src)));
-  format %{ "convHF2SAndHF2F $dst, $src" %}
-  ins_encode %{
-    __ fcvt_s_h($dst$$FloatRegister, $src$$FloatRegister);
-  %}
-  ins_pipe(fp_uop_s);
-%}
-
-instruct sqrt_HF_reg(fRegF dst, fRegF src)
-%{
-  match(Set dst (SqrtHF src));
-  format %{ "fsqrt.h $dst, $src" %}
-  ins_encode %{
-    __ fsqrt_h($dst$$FloatRegister, $src$$FloatRegister);
-  %}
-  ins_pipe(fp_sqrt_s);
-%}
-
-instruct binOps_HF_reg(fRegF dst, fRegF src1, fRegF src2)
-%{
-  match(Set dst (AddHF src1 src2));
-  match(Set dst (SubHF src1 src2));
-  match(Set dst (MulHF src1 src2));
-  match(Set dst (DivHF src1 src2));
-  format %{ "binop_hf $dst, $src1, $src2" %}
-  ins_encode %{
-    int opcode = this->ideal_Opcode();
-    switch(opcode) {
-      case Op_AddHF: __ fadd_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); break;
-      case Op_SubHF: __ fsub_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); break;
-      case Op_MulHF: __ fmul_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); break;
-      case Op_DivHF: __ fdiv_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister); break;
-      default: assert(false, "%s is not supported here", NodeClassNames[opcode]); break;
-    }
-  %}
-  ins_pipe(fp_dop_reg_reg_s);
-%}
-
-instruct min_max_HF_reg(fRegF dst, fRegF src1, fRegF src2)
-%{
-  match(Set dst (MinHF src1 src2));
-  match(Set dst (MaxHF src1 src2));
-  format %{ "min_max_hf $dst, $src1, $src2" %}
-  ins_encode %{
-    int opcode = this->ideal_Opcode();
-    switch(opcode) {
-      case Op_MinHF: __ minmax_fp($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister,
-                                  __ FLOAT_TYPE::half_precision, true);
-                     break;
-      case Op_MaxHF: __ minmax_fp($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister,
-                                  __ FLOAT_TYPE::half_precision, false);
-                     break;
-      default: assert(false, "%s is not supported here", NodeClassNames[opcode]); break;
-    }
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
-instruct fma_HF_reg(fRegF dst, fRegF src1, fRegF src2, fRegF src3)
-%{
-  match(Set dst (FmaHF src3 (Binary src1 src2)));
-  format %{ "fmadd.h $dst, $src1, $src2, $src3\t# $dst = $src1 * $src2 + $src3 fma packedH" %}
-  ins_encode %{
-    __ fmadd_h($dst$$FloatRegister, $src1$$FloatRegister, $src2$$FloatRegister, $src3$$FloatRegister);
-  %}
-  ins_pipe(pipe_class_default);
-%}
-
 // float <-> int
 
 instruct convF2I_reg_reg(iRegINoSp dst, fRegF src) %{

src/hotspot/cpu/riscv/stubGenerator_riscv.cpp

@@ -2436,7 +2436,8 @@ class StubGenerator: public StubCodeGenerator {
                              Register strL, Register strU, Label& DIFF) {
     const Register tmp = x30, tmpLval = x12;
 
-    int base_offset = arrayOopDesc::base_offset_in_bytes(T_BYTE);
+    int base_offset = arrayOopDesc::base_offset_in_bytes(T_CHAR);
+
     assert((base_offset % (UseCompactObjectHeaders ? 4 :
                            (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
 
@@ -2494,21 +2495,25 @@ class StubGenerator: public StubCodeGenerator {
     const Register result = x10, str1 = x11, str2 = x13, cnt2 = x14,
                    tmp1 = x28, tmp2 = x29, tmp3 = x30, tmp4 = x12;
 
-    int base_offset = arrayOopDesc::base_offset_in_bytes(T_BYTE);
-    assert((base_offset % (UseCompactObjectHeaders ? 4 :
-                           (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
+    int base_offset1 = arrayOopDesc::base_offset_in_bytes(T_BYTE);
+    int base_offset2 = arrayOopDesc::base_offset_in_bytes(T_CHAR);
+
+    assert((base_offset1 % (UseCompactObjectHeaders ? 4 :
+                            (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
+    assert((base_offset2 % (UseCompactObjectHeaders ? 4 :
+                            (UseCompressedClassPointers ? 8 : 4))) == 0, "Must be");
 
     Register strU = isLU ? str2 : str1,
              strL = isLU ? str1 : str2,
              tmpU = isLU ? tmp2 : tmp1, // where to keep U for comparison
              tmpL = isLU ? tmp1 : tmp2; // where to keep L for comparison
 
-    if (AvoidUnalignedAccesses && (base_offset % 8) != 0) {
+    if (AvoidUnalignedAccesses && (base_offset1 % 8) != 0) {
       // Load 4 bytes from strL to make sure main loop is 8-byte aligned
       // cnt2 is >= 68 here, no need to check it for >= 0
       __ lwu(tmpL, Address(strL));
       __ addi(strL, strL, wordSize / 2);
-      __ load_long_misaligned(tmpU, Address(strU), tmp4, (base_offset % 8) != 0 ? 4 : 8);
+      __ load_long_misaligned(tmpU, Address(strU), tmp4, (base_offset2 % 8) != 0 ? 4 : 8);
       __ addi(strU, strU, wordSize);
       __ inflate_lo32(tmp3, tmpL);
       __ mv(tmpL, tmp3);
@@ -6151,104 +6156,6 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  // x10 = input (float16)
-  // f10 = result (float)
-  // t1  = temporary register
-  address generate_float16ToFloat() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::hf2f_id;
-    StubCodeMark mark(this, stub_id);
-    address entry = __ pc();
-    BLOCK_COMMENT("float16ToFloat:");
-
-    FloatRegister dst = f10;
-    Register src = x10;
-    Label NaN_SLOW;
-
-    assert(VM_Version::supports_float16_float_conversion(), "must");
-
-    // On riscv, NaN needs a special process as fcvt does not work in that case.
-    // On riscv, Inf does not need a special process as fcvt can handle it correctly.
-    // but we consider to get the slow path to process NaN and Inf at the same time,
-    // as both of them are rare cases, and if we try to get the slow path to handle
-    // only NaN case it would sacrifise the performance for normal cases,
-    // i.e. non-NaN and non-Inf cases.
-
-    // check whether it's a NaN or +/- Inf.
-    __ mv(t0, 0x7c00);
-    __ andr(t1, src, t0);
-    // jump to stub processing NaN and Inf cases.
-    __ beq(t0, t1, NaN_SLOW);
-
-    // non-NaN or non-Inf cases, just use built-in instructions.
-    __ fmv_h_x(dst, src);
-    __ fcvt_s_h(dst, dst);
-    __ ret();
-
-    __ bind(NaN_SLOW);
-    // following instructions mainly focus on NaN, as riscv does not handle
-    // NaN well with fcvt, but the code also works for Inf at the same time.
-
-    // construct a NaN in 32 bits from the NaN in 16 bits,
-    // we need the payloads of non-canonical NaNs to be preserved.
-    __ mv(t1, 0x7f800000);
-    // sign-bit was already set via sign-extension if necessary.
-    __ slli(t0, src, 13);
-    __ orr(t1, t0, t1);
-    __ fmv_w_x(dst, t1);
-
-    __ ret();
-    return entry;
-  }
-
-  // f10 = input (float)
-  // x10 = result (float16)
-  // f11 = temporary float register
-  // t1  = temporary register
-  address generate_floatToFloat16() {
-    __ align(CodeEntryAlignment);
-    StubGenStubId stub_id = StubGenStubId::f2hf_id;
-    StubCodeMark mark(this, stub_id);
-    address entry = __ pc();
-    BLOCK_COMMENT("floatToFloat16:");
-
-    Register dst = x10;
-    FloatRegister src = f10, ftmp = f11;
-    Label NaN_SLOW;
-
-    assert(VM_Version::supports_float16_float_conversion(), "must");
-
-    // On riscv, NaN needs a special process as fcvt does not work in that case.
-
-    // check whether it's a NaN.
-    // replace fclass with feq as performance optimization.
-    __ feq_s(t0, src, src);
-    // jump to stub processing NaN cases.
-    __ beqz(t0, NaN_SLOW);
-
-    // non-NaN cases, just use built-in instructions.
-    __ fcvt_h_s(ftmp, src);
-    __ fmv_x_h(dst, ftmp);
-    __ ret();
-
-    __ bind(NaN_SLOW);
-    __ fmv_x_w(dst, src);
-
-    // preserve the payloads of non-canonical NaNs.
-    __ srai(dst, dst, 13);
-    // preserve the sign bit.
-    __ srai(t1, dst, 13);
-    __ slli(t1, t1, 10);
-    __ mv(t0, 0x3ff);
-    __ orr(t1, t1, t0);
-
-    // get the result by merging sign bit and payloads of preserved non-canonical NaNs.
-    __ andr(dst, dst, t1);
-
-    __ ret();
-    return entry;
-  }
-
 #endif // COMPILER2_OR_JVMCI
 
 #ifdef COMPILER2
@@ -6618,12 +6525,6 @@ static const int64_t right_3_bits = right_n_bits(3);
       StubRoutines::_crc_table_adr = (address)StubRoutines::riscv::_crc_table;
       StubRoutines::_updateBytesCRC32 = generate_updateBytesCRC32();
     }
-
-    if (vmIntrinsics::is_intrinsic_available(vmIntrinsics::_float16ToFloat) &&
-        vmIntrinsics::is_intrinsic_available(vmIntrinsics::_floatToFloat16)) {
-      StubRoutines::_hf2f = generate_float16ToFloat();
-      StubRoutines::_f2hf = generate_floatToFloat16();
-    }
   }
 
   void generate_continuation_stubs() {
@@ -6643,7 +6544,10 @@ static const int64_t right_3_bits = right_n_bits(3);
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+    if (bs_nm != nullptr) {
+      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    }
 
 #ifdef COMPILER2
     if (UseSecondarySupersTable) {

src/hotspot/cpu/riscv/templateInterpreterGenerator_riscv.cpp

@@ -1846,7 +1846,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 
 void TemplateInterpreterGenerator::count_bytecode() {
   __ mv(x7, (address) &BytecodeCounter::_counter_value);
-  __ atomic_add(noreg, 1, x7);
+  __ atomic_addw(noreg, 1, x7);
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {

src/hotspot/cpu/riscv/vm_version_riscv.cpp

@@ -24,7 +24,6 @@
  *
  */
 
-#include "classfile/vmIntrinsics.hpp"
 #include "runtime/java.hpp"
 #include "runtime/os.inline.hpp"
 #include "runtime/vm_version.hpp"
@@ -127,6 +126,10 @@ void VM_Version::common_initialize() {
     FLAG_SET_DEFAULT(UseVectorizedMismatchIntrinsic, false);
   }
 
+  if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics)) {
+    FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
+  }
+
   if (FLAG_IS_DEFAULT(UseCopySignIntrinsic)) {
       FLAG_SET_DEFAULT(UseCopySignIntrinsic, true);
   }
@@ -150,10 +153,6 @@ void VM_Version::common_initialize() {
       unaligned_access.value() != MISALIGNED_FAST);
   }
 
-  if (FLAG_IS_DEFAULT(UsePoly1305Intrinsics) && !AvoidUnalignedAccesses) {
-    FLAG_SET_DEFAULT(UsePoly1305Intrinsics, true);
-  }
-
   // See JDK-8026049
   // This machine has fast unaligned memory accesses
   if (FLAG_IS_DEFAULT(UseUnalignedAccesses)) {
@@ -315,7 +314,7 @@ void VM_Version::c2_initialize() {
     FLAG_SET_DEFAULT(UseMontgomerySquareIntrinsic, true);
   }
 
-  if (FLAG_IS_DEFAULT(UseMD5Intrinsics) && !AvoidUnalignedAccesses) {
+  if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) {
     FLAG_SET_DEFAULT(UseMD5Intrinsics, true);
   }
 
@@ -366,7 +365,7 @@ void VM_Version::c2_initialize() {
 
   // SHA-1, no RVV required though.
   if (UseSHA) {
-    if (FLAG_IS_DEFAULT(UseSHA1Intrinsics) && !AvoidUnalignedAccesses) {
+    if (FLAG_IS_DEFAULT(UseSHA1Intrinsics)) {
       FLAG_SET_DEFAULT(UseSHA1Intrinsics, true);
     }
   } else if (UseSHA1Intrinsics) {
@@ -465,18 +464,3 @@ void VM_Version::initialize_cpu_information(void) {
   snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "RISCV64 %s", features_string());
   _initialized = true;
 }
-
-bool VM_Version::is_intrinsic_supported(vmIntrinsicID id) {
-  assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
-  switch (id) {
-  case vmIntrinsics::_floatToFloat16:
-  case vmIntrinsics::_float16ToFloat:
-    if (!supports_float16_float_conversion()) {
-      return false;
-    }
-    break;
-  default:
-    break;
-  }
-  return true;
-}

src/hotspot/cpu/riscv/vm_version_riscv.hpp

@@ -297,13 +297,6 @@ class VM_Version : public Abstract_VM_Version {
   // RISCV64 supports fast class initialization checks
   static bool supports_fast_class_init_checks() { return true; }
   static bool supports_fencei_barrier() { return ext_Zifencei.enabled(); }
-
-  static bool supports_float16_float_conversion() {
-    return UseZfh || UseZfhmin;
-  }
-
-  // Check intrinsic support
-  static bool is_intrinsic_supported(vmIntrinsicID id);
 };
 
 #endif // CPU_RISCV_VM_VERSION_RISCV_HPP

src/hotspot/cpu/s390/gc/shared/barrierSetAssembler_s390.cpp

@@ -171,6 +171,10 @@ void BarrierSetAssembler::try_resolve_jobject_in_native(MacroAssembler* masm, Re
 
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm == nullptr) {
+    return;
+  }
+
   __ block_comment("nmethod_entry_barrier (nmethod_entry_barrier) {");
 
     // Load jump addr:

src/hotspot/cpu/s390/macroAssembler_s390.cpp

@@ -3931,7 +3931,7 @@ void MacroAssembler::compiler_fast_unlock_object(Register oop, Register box, Reg
 
   bind(not_recursive);
 
-  NearLabel set_eq_unlocked;
+  NearLabel check_succ, set_eq_unlocked;
 
   // Set owner to null.
   // Release to satisfy the JMM
@@ -3941,10 +3941,14 @@ void MacroAssembler::compiler_fast_unlock_object(Register oop, Register box, Reg
   // We need a full fence after clearing owner to avoid stranding.
   z_fence();
 
-  // Check if the entry_list is empty.
-  load_and_test_long(temp, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(entry_list)));
+  // Check if the entry lists are empty (EntryList first - by convention).
+  load_and_test_long(temp, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(EntryList)));
+  z_brne(check_succ);
+  load_and_test_long(temp, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(cxq)));
   z_bre(done); // If so we are done.
 
+  bind(check_succ);
+
   // Check if there is a successor.
   load_and_test_long(temp, Address(currentHeader, OM_OFFSET_NO_MONITOR_VALUE_TAG(succ)));
   z_brne(set_eq_unlocked); // If so we are done.
@@ -6790,8 +6794,9 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
 
     const ByteSize monitor_tag = in_ByteSize(UseObjectMonitorTable ? 0 : checked_cast<int>(markWord::monitor_value));
     const Address recursions_address{monitor, ObjectMonitor::recursions_offset() - monitor_tag};
+    const Address cxq_address{monitor, ObjectMonitor::cxq_offset() - monitor_tag};
     const Address succ_address{monitor, ObjectMonitor::succ_offset() - monitor_tag};
-    const Address entry_list_address{monitor, ObjectMonitor::entry_list_offset() - monitor_tag};
+    const Address EntryList_address{monitor, ObjectMonitor::EntryList_offset() - monitor_tag};
     const Address owner_address{monitor, ObjectMonitor::owner_offset() - monitor_tag};
 
     NearLabel not_recursive;
@@ -6808,7 +6813,7 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
 
     bind(not_recursive);
 
-    NearLabel set_eq_unlocked;
+    NearLabel check_succ, set_eq_unlocked;
 
     // Set owner to null.
     // Release to satisfy the JMM
@@ -6818,10 +6823,14 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(Register obj, Regis
     // We need a full fence after clearing owner to avoid stranding.
     z_fence();
 
-    // Check if the entry_list is empty.
-    load_and_test_long(tmp2, entry_list_address);
+    // Check if the entry lists are empty (EntryList first - by convention).
+    load_and_test_long(tmp2, EntryList_address);
+    z_brne(check_succ);
+    load_and_test_long(tmp2, cxq_address);
     z_bre(unlocked); // If so we are done.
 
+    bind(check_succ);
+
     // Check if there is a successor.
     load_and_test_long(tmp2, succ_address);
     z_brne(set_eq_unlocked); // If so we are done.

src/hotspot/cpu/s390/stubGenerator_s390.cpp

@@ -3217,7 +3217,10 @@ class StubGenerator: public StubCodeGenerator {
     generate_arraycopy_stubs();
 
     // nmethod entry barriers for concurrent class unloading
-    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+    if (bs_nm != nullptr) {
+      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    }
 
 #ifdef COMPILER2
     if (UseSecondarySupersTable) {

src/hotspot/cpu/s390/templateInterpreterGenerator_s390.cpp

@@ -2329,7 +2329,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
     // Skip runtime call, if the trace threshold is not yet reached.
     __ load_absolute_address(Z_tmp_1, (address)&BytecodeCounter::_counter_value);
     __ load_absolute_address(Z_tmp_2, (address)&TraceBytecodesAt);
-    __ load_sized_value(Z_tmp_1, Address(Z_tmp_1), 8, false /*signed*/);
+    __ load_sized_value(Z_tmp_1, Address(Z_tmp_1), 4, false /*signed*/);
     __ load_sized_value(Z_tmp_2, Address(Z_tmp_2), 8, false /*signed*/);
     __ compareU64_and_branch(Z_tmp_1, Z_tmp_2, Assembler::bcondLow, counter_below_trace_threshold);
   }
@@ -2359,7 +2359,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 // Make feasible for old CPUs.
 void TemplateInterpreterGenerator::count_bytecode() {
   __ load_absolute_address(Z_R1_scratch, (address) &BytecodeCounter::_counter_value);
-  __ add2mem_64(Address(Z_R1_scratch), 1, Z_R0_scratch);
+  __ add2mem_32(Address(Z_R1_scratch), 1, Z_R0_scratch);
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template * t) {
@@ -2406,7 +2406,7 @@ void TemplateInterpreterGenerator::stop_interpreter_at() {
 
   __ load_absolute_address(Z_tmp_1, (address)&BytecodeCounter::_counter_value);
   __ load_absolute_address(Z_tmp_2, (address)&StopInterpreterAt);
-  __ load_sized_value(Z_tmp_1, Address(Z_tmp_1), 8, false /*signed*/);
+  __ load_sized_value(Z_tmp_1, Address(Z_tmp_1), 4, false /*signed*/);
   __ load_sized_value(Z_tmp_2, Address(Z_tmp_2), 8, false /*signed*/);
   __ compareU64_and_branch(Z_tmp_1, Z_tmp_2, Assembler::bcondLow, L);
   assert(Z_tmp_1->is_nonvolatile(), "must be nonvolatile to preserve Z_tos");

src/hotspot/cpu/x86/c1_LIRGenerator_x86.cpp

@@ -1054,7 +1054,7 @@ void LIRGenerator::do_ArrayCopy(Intrinsic* x) {
 }
 
 void LIRGenerator::do_update_CRC32(Intrinsic* x) {
-  assert(UseCRC32Intrinsics, "need AVX and CLMUL instructions support");
+  assert(UseCRC32Intrinsics, "need AVX and LCMUL instructions support");
   // Make all state_for calls early since they can emit code
   LIR_Opr result = rlock_result(x);
   int flags = 0;
@@ -1131,72 +1131,7 @@ void LIRGenerator::do_update_CRC32(Intrinsic* x) {
 }
 
 void LIRGenerator::do_update_CRC32C(Intrinsic* x) {
-  assert(UseCRC32CIntrinsics, "need AVX and CLMUL instructions support");
-  LIR_Opr result = rlock_result(x);
-
-  switch (x->id()) {
-    case vmIntrinsics::_updateBytesCRC32C:
-    case vmIntrinsics::_updateDirectByteBufferCRC32C: {
-      bool is_updateBytes = (x->id() == vmIntrinsics::_updateBytesCRC32C);
-
-      LIRItem crc(x->argument_at(0), this);
-      LIRItem buf(x->argument_at(1), this);
-      LIRItem off(x->argument_at(2), this);
-      LIRItem end(x->argument_at(3), this);
-      buf.load_item();
-      off.load_nonconstant();
-      end.load_nonconstant();
-
-      // len = end - off
-      LIR_Opr len  = end.result();
-      LIR_Opr tmpA = new_register(T_INT);
-      LIR_Opr tmpB = new_register(T_INT);
-      __ move(end.result(), tmpA);
-      __ move(off.result(), tmpB);
-      __ sub(tmpA, tmpB, tmpA);
-      len = tmpA;
-
-      LIR_Opr index = off.result();
-      int offset = is_updateBytes ? arrayOopDesc::base_offset_in_bytes(T_BYTE) : 0;
-      if (off.result()->is_constant()) {
-        index = LIR_OprFact::illegalOpr;
-        offset += off.result()->as_jint();
-      }
-      LIR_Opr base_op = buf.result();
-      LIR_Address* a = nullptr;
-
-      if (index->is_valid()) {
-        LIR_Opr tmp = new_register(T_LONG);
-        __ convert(Bytecodes::_i2l, index, tmp);
-        index = tmp;
-        a = new LIR_Address(base_op, index, offset, T_BYTE);
-      } else {
-        a = new LIR_Address(base_op, offset, T_BYTE);
-      }
-
-      BasicTypeList signature(3);
-      signature.append(T_INT);
-      signature.append(T_ADDRESS);
-      signature.append(T_INT);
-      CallingConvention* cc = frame_map()->c_calling_convention(&signature);
-      const LIR_Opr result_reg = result_register_for(x->type());
-
-      LIR_Opr arg1 = cc->at(0),
-              arg2 = cc->at(1),
-              arg3 = cc->at(2);
-
-      crc.load_item_force(arg1);
-      __ leal(LIR_OprFact::address(a), arg2);
-      __ move(len, arg3);
-
-      __ call_runtime_leaf(StubRoutines::updateBytesCRC32C(), getThreadTemp(), result_reg, cc->args());
-      __ move(result_reg, result);
-      break;
-    }
-    default: {
-      ShouldNotReachHere();
-    }
-  }
+  Unimplemented();
 }
 
 void LIRGenerator::do_vectorizedMismatch(Intrinsic* x) {

src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp

@@ -134,19 +134,21 @@ void C2_MacroAssembler::verified_entry(int framesize, int stack_bang_size, bool
   if (!is_stub) {
     BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
  #ifdef _LP64
-    // We put the non-hot code of the nmethod entry barrier out-of-line in a stub.
-    Label dummy_slow_path;
-    Label dummy_continuation;
-    Label* slow_path = &dummy_slow_path;
-    Label* continuation = &dummy_continuation;
-    if (!Compile::current()->output()->in_scratch_emit_size()) {
-      // Use real labels from actual stub when not emitting code for the purpose of measuring its size
-      C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
-      Compile::current()->output()->add_stub(stub);
-      slow_path = &stub->entry();
-      continuation = &stub->continuation();
+    if (BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
+      // We put the non-hot code of the nmethod entry barrier out-of-line in a stub.
+      Label dummy_slow_path;
+      Label dummy_continuation;
+      Label* slow_path = &dummy_slow_path;
+      Label* continuation = &dummy_continuation;
+      if (!Compile::current()->output()->in_scratch_emit_size()) {
+        // Use real labels from actual stub when not emitting code for the purpose of measuring its size
+        C2EntryBarrierStub* stub = new (Compile::current()->comp_arena()) C2EntryBarrierStub();
+        Compile::current()->output()->add_stub(stub);
+        slow_path = &stub->entry();
+        continuation = &stub->continuation();
+      }
+      bs->nmethod_entry_barrier(this, slow_path, continuation);
     }
-    bs->nmethod_entry_barrier(this, slow_path, continuation);
 #else
     // Don't bother with out-of-line nmethod entry barrier stub for x86_32.
     bs->nmethod_entry_barrier(this, nullptr /* slow_path */, nullptr /* continuation */);
@@ -412,6 +414,8 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   // Despite our balanced locking property we still check that m->_owner == Self
   // as java routines or native JNI code called by this thread might
   // have released the lock.
+  // Refer to the comments in synchronizer.cpp for how we might encode extra
+  // state in _succ so we can avoid fetching EntryList|cxq.
   //
   // If there's no contention try a 1-0 exit.  That is, exit without
   // a costly MEMBAR or CAS.  See synchronizer.cpp for details on how
@@ -443,8 +447,9 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   // StoreLoad achieves this.
   membar(StoreLoad);
 
-  // Check if the entry_list is empty.
-  cmpptr(Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(entry_list)), NULL_WORD);
+  // Check if the entry lists are empty (EntryList first - by convention).
+  movptr(boxReg, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(EntryList)));
+  orptr(boxReg, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(cxq)));
   jccb(Assembler::zero, LSuccess);    // If so we are done.
 
   // Check if there is a successor.
@@ -762,8 +767,9 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
     }
     const ByteSize monitor_tag = in_ByteSize(UseObjectMonitorTable ? 0 : checked_cast<int>(markWord::monitor_value));
     const Address recursions_address{monitor, ObjectMonitor::recursions_offset() - monitor_tag};
+    const Address cxq_address{monitor, ObjectMonitor::cxq_offset() - monitor_tag};
     const Address succ_address{monitor, ObjectMonitor::succ_offset() - monitor_tag};
-    const Address entry_list_address{monitor, ObjectMonitor::entry_list_offset() - monitor_tag};
+    const Address EntryList_address{monitor, ObjectMonitor::EntryList_offset() - monitor_tag};
     const Address owner_address{monitor, ObjectMonitor::owner_offset() - monitor_tag};
 
     Label recursive;
@@ -779,8 +785,9 @@ void C2_MacroAssembler::fast_unlock_lightweight(Register obj, Register reg_rax,
     // StoreLoad achieves this.
     membar(StoreLoad);
 
-    // Check if the entry_list is empty.
-    cmpptr(entry_list_address, NULL_WORD);
+    // Check if the entry lists are empty (EntryList first - by convention).
+    movptr(reg_rax, EntryList_address);
+    orptr(reg_rax, cxq_address);
     jccb(Assembler::zero, unlocked);    // If so we are done.
 
     // Check if there is a successor.
@@ -6855,7 +6862,7 @@ void C2_MacroAssembler::vpsign_extend_dq(BasicType elem_bt, XMMRegister dst, XMM
 
 void C2_MacroAssembler::vpgenmax_value(BasicType elem_bt, XMMRegister dst, XMMRegister allones, int vlen_enc, bool compute_allones) {
   if (compute_allones) {
-    if (VM_Version::supports_avx512vl() || vlen_enc == Assembler::AVX_512bit) {
+    if (vlen_enc == Assembler::AVX_512bit) {
       vpternlogd(allones, 0xff, allones, allones, vlen_enc);
     } else {
       vpcmpeqq(allones, allones, allones, vlen_enc);
@@ -6871,7 +6878,7 @@ void C2_MacroAssembler::vpgenmax_value(BasicType elem_bt, XMMRegister dst, XMMRe
 
 void C2_MacroAssembler::vpgenmin_value(BasicType elem_bt, XMMRegister dst, XMMRegister allones, int vlen_enc, bool compute_allones) {
   if (compute_allones) {
-    if (VM_Version::supports_avx512vl() || vlen_enc == Assembler::AVX_512bit) {
+    if (vlen_enc == Assembler::AVX_512bit) {
       vpternlogd(allones, 0xff, allones, allones, vlen_enc);
     } else {
       vpcmpeqq(allones, allones, allones, vlen_enc);

src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp

@@ -354,6 +354,9 @@ void BarrierSetAssembler::tlab_allocate(MacroAssembler* masm,
 #ifdef _LP64
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slow_path, Label* continuation) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm == nullptr) {
+    return;
+  }
   Register thread = r15_thread;
   Address disarmed_addr(thread, in_bytes(bs_nm->thread_disarmed_guard_value_offset()));
   // The immediate is the last 4 bytes, so if we align the start of the cmp
@@ -378,6 +381,10 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slo
 #else
 void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label*, Label*) {
   BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm == nullptr) {
+    return;
+  }
+
   Label continuation;
 
   Register tmp = rdi;
@@ -394,6 +401,11 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label*, La
 #endif
 
 void BarrierSetAssembler::c2i_entry_barrier(MacroAssembler* masm) {
+  BarrierSetNMethod* bs = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs == nullptr) {
+    return;
+  }
+
   Label bad_call;
   __ cmpptr(rbx, 0); // rbx contains the incoming method for c2i adapters.
   __ jcc(Assembler::equal, bad_call);

src/hotspot/cpu/x86/gc/shared/cardTableBarrierSetAssembler_x86.cpp

@@ -47,7 +47,6 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
   CardTable* ct = ctbs->card_table();
   intptr_t disp = (intptr_t) ct->byte_map_base();
-  SHENANDOAHGC_ONLY(assert(!UseShenandoahGC, "Shenandoah byte_map_base is not constant.");)
 
   Label L_loop, L_done;
   const Register end = count;

src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.cpp

@@ -614,31 +614,31 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
 
   // Does a store check for the oop in register obj. The content of
   // register obj is destroyed afterwards.
+
+  ShenandoahBarrierSet* ctbs = ShenandoahBarrierSet::barrier_set();
+  CardTable* ct = ctbs->card_table();
+
   __ shrptr(obj, CardTable::card_shift());
 
-  // We'll use this register as the TLS base address and also later on
-  // to hold the byte_map_base.
-  Register thread = LP64_ONLY(r15_thread) NOT_LP64(rcx);
-  Register tmp = LP64_ONLY(rscratch1) NOT_LP64(rdx);
+  Address card_addr;
 
-#ifndef _LP64
-  // The next two ifs are just to get temporary registers to use for TLS and card table base.
-  if (thread == obj) {
-    thread = rdx;
-    tmp = rsi;
+  // The calculation for byte_map_base is as follows:
+  // byte_map_base = _byte_map - (uintptr_t(low_bound) >> card_shift);
+  // So this essentially converts an address to a displacement and it will
+  // never need to be relocated. On 64-bit however the value may be too
+  // large for a 32-bit displacement.
+  intptr_t byte_map_base = (intptr_t)ct->byte_map_base();
+  if (__ is_simm32(byte_map_base)) {
+    card_addr = Address(noreg, obj, Address::times_1, byte_map_base);
+  } else {
+    // By doing it as an ExternalAddress 'byte_map_base' could be converted to a rip-relative
+    // displacement and done in a single instruction given favorable mapping and a
+    // smarter version of as_Address. However, 'ExternalAddress' generates a relocation
+    // entry and that entry is not properly handled by the relocation code.
+    AddressLiteral cardtable((address)byte_map_base, relocInfo::none);
+    Address index(noreg, obj, Address::times_1);
+    card_addr = __ as_Address(ArrayAddress(cardtable, index), rscratch1);
   }
-  if (tmp == obj) {
-    tmp = rsi;
-  }
-
-  __ push(thread);
-  __ push(tmp);
-  __ get_thread(thread);
-#endif
-
-  Address curr_ct_holder_addr(thread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
-  __ movptr(tmp, curr_ct_holder_addr);
-  Address card_addr(tmp, obj, Address::times_1);
 
   int dirty = CardTable::dirty_card_val();
   if (UseCondCardMark) {
@@ -650,11 +650,6 @@ void ShenandoahBarrierSetAssembler::store_check(MacroAssembler* masm, Register o
   } else {
     __ movb(card_addr, dirty);
   }
-
-#ifndef _LP64
-  __ pop(tmp);
-  __ pop(thread);
-#endif
 }
 
 void ShenandoahBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
@@ -910,6 +905,10 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
                                                                      Register tmp) {
   assert(ShenandoahCardBarrier, "Should have been checked by caller");
 
+  ShenandoahBarrierSet* bs = ShenandoahBarrierSet::barrier_set();
+  CardTable* ct = bs->card_table();
+  intptr_t disp = (intptr_t) ct->byte_map_base();
+
   Label L_loop, L_done;
   const Register end = count;
   assert_different_registers(addr, end);
@@ -919,16 +918,13 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   __ jccb(Assembler::zero, L_done);
 
 #ifdef _LP64
-  const Register thread = r15_thread;
-  Address curr_ct_holder_addr(thread, in_bytes(ShenandoahThreadLocalData::card_table_offset()));
-  __ movptr(tmp, curr_ct_holder_addr);
-
   __ leaq(end, Address(addr, count, TIMES_OOP, 0));  // end == addr+count*oop_size
   __ subptr(end, BytesPerHeapOop); // end - 1 to make inclusive
   __ shrptr(addr, CardTable::card_shift());
   __ shrptr(end, CardTable::card_shift());
   __ subptr(end, addr); // end --> cards count
 
+  __ mov64(tmp, disp);
   __ addptr(addr, tmp);
 
   __ BIND(L_loop);
@@ -936,21 +932,13 @@ void ShenandoahBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssemb
   __ decrement(count);
   __ jccb(Assembler::greaterEqual, L_loop);
 #else
-  const Register thread = tmp;
-  __ get_thread(thread);
-
-  Address curr_ct_holder_addr(thread, in_bytes(ShenandoahThreadLocalData::byte_map_base_offset()));
-  __ movptr(tmp, curr_ct_holder_addr);
-
   __ lea(end, Address(addr, count, Address::times_ptr, -wordSize));
   __ shrptr(addr, CardTable::card_shift());
   __ shrptr(end,  CardTable::card_shift());
   __ subptr(end, addr); // end --> count
 
-  __ addptr(addr, tmp);
-
   __ BIND(L_loop);
-  Address cardtable(addr, count, Address::times_1, 0);
+  Address cardtable(addr, count, Address::times_1, disp);
   __ movb(cardtable, 0);
   __ decrement(count);
   __ jccb(Assembler::greaterEqual, L_loop);

src/hotspot/cpu/x86/sharedRuntime_x86_64.cpp

@@ -101,23 +101,24 @@ class RegisterSaver {
     ymm_off = xmm_off + (XSAVE_AREA_YMM_BEGIN - XSAVE_AREA_BEGIN)/BytesPerInt,
     DEF_YMM_OFFS(0),
     DEF_YMM_OFFS(1),
-    r16_off = xmm_off + (XSAVE_AREA_EGPRS - XSAVE_AREA_BEGIN)/BytesPerInt,
-    r16H_off,
-    r17_off, r17H_off,
-    r18_off, r18H_off,
-    r19_off, r19H_off,
-    r20_off, r20H_off,
-    r21_off, r21H_off,
-    r22_off, r22H_off,
-    r23_off, r23H_off,
-    r24_off, r24H_off,
-    r25_off, r25H_off,
-    r26_off, r26H_off,
-    r27_off, r27H_off,
-    r28_off, r28H_off,
-    r29_off, r29H_off,
+    // 2..15 are implied in range usage
+    r31_off = xmm_off + (XSAVE_AREA_EGPRS - XSAVE_AREA_BEGIN)/BytesPerInt,
+    r31H_off,
     r30_off, r30H_off,
-    r31_off, r31H_off,
+    r29_off, r29H_off,
+    r28_off, r28H_off,
+    r27_off, r27H_off,
+    r26_off, r26H_off,
+    r25_off, r25H_off,
+    r24_off, r24H_off,
+    r23_off, r23H_off,
+    r22_off, r22H_off,
+    r21_off, r21H_off,
+    r20_off, r20H_off,
+    r19_off, r19H_off,
+    r18_off, r18H_off,
+    r17_off, r17H_off,
+    r16_off, r16H_off,
     opmask_off   = xmm_off + (XSAVE_AREA_OPMASK_BEGIN - XSAVE_AREA_BEGIN)/BytesPerInt,
     DEF_OPMASK_OFFS(0),
     DEF_OPMASK_OFFS(1),
@@ -264,7 +265,7 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
   if (UseAPX) {
       int base_addr = XSAVE_AREA_EGPRS;
       off = 0;
-      for (int n = 16; n < Register::number_of_registers; n++) {
+      for(int n = 16; n < Register::number_of_registers; n++) {
         __ movq(Address(rsp, base_addr+(off++*8)), as_Register(n));
       }
   }

src/hotspot/cpu/x86/stubGenerator_x86_32.cpp

@@ -4211,7 +4211,10 @@ class StubGenerator: public StubCodeGenerator {
     // arraycopy stubs used by compilers
     generate_arraycopy_stubs();
 
-    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+    if (bs_nm != nullptr) {
+      StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+    }
   }
 
   void generate_compiler_stubs() {

src/hotspot/cpu/x86/stubGenerator_x86_64.cpp

@@ -4136,7 +4136,10 @@ void StubGenerator::generate_final_stubs() {
   // arraycopy stubs used by compilers
   generate_arraycopy_stubs();
 
-  StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm != nullptr) {
+    StubRoutines::_method_entry_barrier = generate_method_entry_barrier();
+  }
 
 #ifdef COMPILER2
   if (UseSecondarySupersTable) {

src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp

@@ -1874,11 +1874,7 @@ address TemplateInterpreterGenerator::generate_trace_code(TosState state) {
 }
 
 void TemplateInterpreterGenerator::count_bytecode() {
-  #ifndef _LP64
   __ incrementl(ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch1);
-  #else
-  __ incrementq(ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch1);
-  #endif
 }
 
 void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
@@ -1918,14 +1914,9 @@ void TemplateInterpreterGenerator::trace_bytecode(Template* t) {
 
 void TemplateInterpreterGenerator::stop_interpreter_at() {
   Label L;
-  #ifndef _LP64
   __ cmp32(ExternalAddress((address) &BytecodeCounter::_counter_value),
            StopInterpreterAt,
            rscratch1);
-  #else
-  __ mov64(rscratch1, StopInterpreterAt);
-  __ cmp64(rscratch1, ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch2);
-  #endif
   __ jcc(Assembler::notEqual, L);
   __ int3();
   __ bind(L);

src/hotspot/cpu/x86/x86_64.ad

@@ -818,7 +818,7 @@ void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
     st->print("# stack alignment check");
 #endif
   }
-  if (C->stub_function() != nullptr) {
+  if (C->stub_function() != nullptr && BarrierSet::barrier_set()->barrier_set_nmethod() != nullptr) {
     st->print("\n\t");
     st->print("cmpl    [r15_thread + #disarmed_guard_value_offset], #disarmed_guard_value\t");
     st->print("\n\t");

src/hotspot/os/aix/os_aix.cpp

@@ -839,6 +839,13 @@ bool os::create_attached_thread(JavaThread* thread) {
 
   thread->set_osthread(osthread);
 
+  if (UseNUMA) {
+    int lgrp_id = os::numa_get_group_id();
+    if (lgrp_id != -1) {
+      thread->set_lgrp_id(lgrp_id);
+    }
+  }
+
   // initialize signal mask for this thread
   // and save the caller's signal mask
   PosixSignals::hotspot_sigmask(thread);

src/hotspot/os/bsd/gc/z/zNUMA_bsd.cpp

@@ -26,7 +26,10 @@
 
 void ZNUMA::pd_initialize() {
   _enabled = false;
-  _count = 1;
+}
+
+uint32_t ZNUMA::count() {
+  return 1;
 }
 
 uint32_t ZNUMA::id() {

src/hotspot/os/linux/cgroupUtil_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, 2025, Red Hat, Inc.
+ * 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
@@ -49,18 +49,12 @@ int CgroupUtil::processor_count(CgroupCpuController* cpu_ctrl, int host_cpus) {
 }
 
 void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
-  assert(mem->cgroup_path() != nullptr, "invariant");
-  if (strstr(mem->cgroup_path(), "../") != nullptr) {
-    log_warning(os, container)("Cgroup memory controller path at '%s' seems to have moved to '%s', detected limits won't be accurate",
-      mem->mount_point(), mem->cgroup_path());
-    mem->set_subsystem_path("/");
-    return;
-  }
   if (!mem->needs_hierarchy_adjustment()) {
     // nothing to do
     return;
   }
   log_trace(os, container)("Adjusting controller path for memory: %s", mem->subsystem_path());
+  assert(mem->cgroup_path() != nullptr, "invariant");
   char* orig = os::strdup(mem->cgroup_path());
   char* cg_path = os::strdup(orig);
   char* last_slash;
@@ -68,8 +62,7 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
   julong phys_mem = os::Linux::physical_memory();
   char* limit_cg_path = nullptr;
   jlong limit = mem->read_memory_limit_in_bytes(phys_mem);
-  jlong lowest_limit = limit < 0 ? phys_mem : limit;
-  julong orig_limit = ((julong)lowest_limit) != phys_mem ? lowest_limit : phys_mem;
+  jlong lowest_limit = phys_mem;
   while ((last_slash = strrchr(cg_path, '/')) != cg_path) {
     *last_slash = '\0'; // strip path
     // update to shortened path and try again
@@ -90,7 +83,7 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
     limit_cg_path = os::strdup("/");
   }
   assert(lowest_limit >= 0, "limit must be positive");
-  if ((julong)lowest_limit != orig_limit) {
+  if ((julong)lowest_limit != phys_mem) {
     // we've found a lower limit anywhere in the hierarchy,
     // set the path to the limit path
     assert(limit_cg_path != nullptr, "limit path must be set");
@@ -100,7 +93,6 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
                              mem->subsystem_path(),
                              lowest_limit);
   } else {
-    log_trace(os, container)("Lowest limit was: " JLONG_FORMAT, lowest_limit);
     log_trace(os, container)("No lower limit found for memory in hierarchy %s, "
                              "adjusting to original path %s",
                               mem->mount_point(), orig);
@@ -112,26 +104,19 @@ void CgroupUtil::adjust_controller(CgroupMemoryController* mem) {
 }
 
 void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
-  assert(cpu->cgroup_path() != nullptr, "invariant");
-  if (strstr(cpu->cgroup_path(), "../") != nullptr) {
-    log_warning(os, container)("Cgroup cpu controller path at '%s' seems to have moved to '%s', detected limits won't be accurate",
-      cpu->mount_point(), cpu->cgroup_path());
-    cpu->set_subsystem_path("/");
-    return;
-  }
   if (!cpu->needs_hierarchy_adjustment()) {
     // nothing to do
     return;
   }
   log_trace(os, container)("Adjusting controller path for cpu: %s", cpu->subsystem_path());
+  assert(cpu->cgroup_path() != nullptr, "invariant");
   char* orig = os::strdup(cpu->cgroup_path());
   char* cg_path = os::strdup(orig);
   char* last_slash;
   assert(cg_path[0] == '/', "cgroup path must start with '/'");
   int host_cpus = os::Linux::active_processor_count();
   int cpus = CgroupUtil::processor_count(cpu, host_cpus);
-  int lowest_limit = cpus < host_cpus ? cpus: host_cpus;
-  int orig_limit = lowest_limit != host_cpus ? lowest_limit : host_cpus;
+  int lowest_limit = host_cpus;
   char* limit_cg_path = nullptr;
   while ((last_slash = strrchr(cg_path, '/')) != cg_path) {
     *last_slash = '\0'; // strip path
@@ -153,7 +138,7 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
     limit_cg_path = os::strdup(cg_path);
   }
   assert(lowest_limit >= 0, "limit must be positive");
-  if (lowest_limit != orig_limit) {
+  if (lowest_limit != host_cpus) {
     // we've found a lower limit anywhere in the hierarchy,
     // set the path to the limit path
     assert(limit_cg_path != nullptr, "limit path must be set");
@@ -163,7 +148,6 @@ void CgroupUtil::adjust_controller(CgroupCpuController* cpu) {
                              cpu->subsystem_path(),
                              lowest_limit);
   } else {
-    log_trace(os, container)("Lowest limit was: %d", lowest_limit);
     log_trace(os, container)("No lower limit found for cpu in hierarchy %s, "
                              "adjusting to original path %s",
                               cpu->mount_point(), orig);

src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2025, 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,47 +37,6 @@
 /*
  * Set directory to subsystem specific files based
  * on the contents of the mountinfo and cgroup files.
- *
- * The method determines whether it runs in
- * - host mode
- * - container mode
- *
- * In the host mode, _root is equal to "/" and
- * the subsystem path is equal to the _mount_point path
- * joined with cgroup_path.
- *
- * In the container mode, it can be two possibilities:
- * - private namespace (cgroupns=private)
- * - host namespace (cgroupns=host, default mode in cgroup V1 hosts)
- *
- * Private namespace is equivalent to the host mode, i.e.
- * the subsystem path is set by concatenating
- * _mount_point and cgroup_path.
- *
- * In the host namespace, _root is equal to host's cgroup path
- * of the control group to which the containerized process
- * belongs to at the moment of creation. The mountinfo and
- * cgroup files are mirrored from the host, while the subsystem
- * specific files are mapped directly at _mount_point, i.e.
- * at /sys/fs/cgroup/<controller>/, the subsystem path is
- * then set equal to _mount_point.
- *
- * A special case of the subsystem path is when a cgroup path
- * includes a subgroup, when a containerized process was associated
- * with an existing cgroup, that is different from cgroup
- * in which the process has been created.
- * Here, the _root is equal to the host's initial cgroup path,
- * cgroup_path will be equal to host's new cgroup path.
- * As host cgroup hierarchies are not accessible in the container,
- * it needs to be determined which part of cgroup path
- * is accessible inside container, i.e. mapped under
- * /sys/fs/cgroup/<controller>/<subgroup>.
- * In Docker default setup, host's cgroup path can be
- * of the form: /docker/<CONTAINER_ID>/<subgroup>,
- * from which only <subgroup> is mapped.
- * The method trims cgroup path from left, until the subgroup
- * component is found. The subsystem path will be set to
- * the _mount_point joined with the subgroup path.
  */
 void CgroupV1Controller::set_subsystem_path(const char* cgroup_path) {
   if (_cgroup_path != nullptr) {
@@ -90,36 +49,28 @@ void CgroupV1Controller::set_subsystem_path(const char* cgroup_path) {
   _cgroup_path = os::strdup(cgroup_path);
   stringStream ss;
   if (_root != nullptr && cgroup_path != nullptr) {
-    ss.print_raw(_mount_point);
     if (strcmp(_root, "/") == 0) {
-      // host processes and containers with cgroupns=private
+      ss.print_raw(_mount_point);
       if (strcmp(cgroup_path,"/") != 0) {
         ss.print_raw(cgroup_path);
       }
+      _path = os::strdup(ss.base());
     } else {
-      // containers with cgroupns=host, default setting is _root==cgroup_path
-      if (strcmp(_root, cgroup_path) != 0) {
-        if (*cgroup_path != '\0' && strcmp(cgroup_path, "/") != 0) {
-          // When moved to a subgroup, between subgroups, the path suffix will change.
-          const char *suffix = cgroup_path;
-          while (suffix != nullptr) {
-            stringStream pp;
-            pp.print_raw(_mount_point);
-            pp.print_raw(suffix);
-            if (os::file_exists(pp.base())) {
-              ss.print_raw(suffix);
-              if (suffix != cgroup_path) {
-                log_trace(os, container)("set_subsystem_path: cgroup v1 path reduced to: %s.", suffix);
-              }
-              break;
-            }
-            log_trace(os, container)("set_subsystem_path: skipped non-existent directory: %s.", suffix);
-            suffix = strchr(suffix + 1, '/');
+      if (strcmp(_root, cgroup_path) == 0) {
+        ss.print_raw(_mount_point);
+        _path = os::strdup(ss.base());
+      } else {
+        char *p = strstr((char*)cgroup_path, _root);
+        if (p != nullptr && p == _root) {
+          if (strlen(cgroup_path) > strlen(_root)) {
+            ss.print_raw(_mount_point);
+            const char* cg_path_sub = cgroup_path + strlen(_root);
+            ss.print_raw(cg_path_sub);
+            _path = os::strdup(ss.base());
           }
         }
       }
     }
-    _path = os::strdup(ss.base());
   }
 }
 

src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2025, Red Hat Inc.
+ * Copyright (c) 2020, 2022, 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
@@ -292,10 +292,6 @@ jlong memory_swap_limit_value(CgroupV2Controller* ctrl) {
 }
 
 void CgroupV2Controller::set_subsystem_path(const char* cgroup_path) {
-  if (_cgroup_path != nullptr) {
-    os::free(_cgroup_path);
-  }
-  _cgroup_path = os::strdup(cgroup_path);
   if (_path != nullptr) {
     os::free(_path);
   }

src/hotspot/os/linux/gc/z/zNUMA_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2025, 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
@@ -32,9 +32,15 @@
 
 void ZNUMA::pd_initialize() {
   _enabled = UseNUMA;
-  _count = UseNUMA
-      ? os::Linux::numa_max_node() + 1
-      : 1;
+}
+
+uint32_t ZNUMA::count() {
+  if (!_enabled) {
+    // NUMA support not enabled
+    return 1;
+  }
+
+  return os::Linux::numa_max_node() + 1;
 }
 
 uint32_t ZNUMA::id() {
@@ -59,7 +65,7 @@ uint32_t ZNUMA::memory_id(uintptr_t addr) {
     fatal("Failed to get NUMA id for memory at " PTR_FORMAT " (%s)", addr, err.to_string());
   }
 
-  assert(id < _count, "Invalid NUMA id");
+  assert(id < count(), "Invalid NUMA id");
 
   return id;
 }

src/hotspot/os/posix/attachListener_posix.cpp

@@ -114,7 +114,6 @@ public:
 
   void close() {
     if (opened()) {
-      ::shutdown(_socket, SHUT_RDWR);
       ::close(_socket);
       _socket = -1;
     }
@@ -133,8 +132,9 @@ public:
     RESTARTABLE(::write(_socket, buffer, size), n);
     return checked_cast<int>(n);
   }
-
+  // called after writing all data
   void flush() override {
+    ::shutdown(_socket, SHUT_RDWR);
   }
 };
 
@@ -144,16 +144,13 @@ class PosixAttachOperation: public AttachOperation {
   SocketChannel _socket_channel;
 
  public:
-  PosixAttachOperation(int socket) : AttachOperation(), _socket_channel(socket) {}
-
   void complete(jint res, bufferedStream* st) override;
 
-  ReplyWriter* get_reply_writer() override {
-    return &_socket_channel;
+  PosixAttachOperation(int socket) : AttachOperation(), _socket_channel(socket) {
   }
 
   bool read_request() {
-    return _socket_channel.read_request(this, &_socket_channel);
+    return AttachOperation::read_request(&_socket_channel, &_socket_channel);
   }
 };
 
@@ -321,6 +318,11 @@ PosixAttachOperation* PosixAttachListener::dequeue() {
 // socket could be made non-blocking and a timeout could be used.
 
 void PosixAttachOperation::complete(jint result, bufferedStream* st) {
+  JavaThread* thread = JavaThread::current();
+  ThreadBlockInVM tbivm(thread);
+
+  write_reply(&_socket_channel, result, st);
+
   delete this;
 }
 

src/hotspot/os/windows/attachListener_windows.cpp

@@ -92,7 +92,6 @@ public:
 
   void close() {
     if (opened()) {
-      FlushFileBuffers(_hPipe);
       CloseHandle(_hPipe);
       _hPipe = INVALID_HANDLE_VALUE;
     }
@@ -124,13 +123,15 @@ public:
                               &written,
                               nullptr);  // not overlapped
     if (!fSuccess) {
-      log_error(attach)("pipe write error (%d)", GetLastError());
-      return -1;
+        log_error(attach)("pipe write error (%d)", GetLastError());
+        return -1;
     }
     return (int)written;
   }
 
   void flush() override {
+    assert(opened(), "must be");
+    FlushFileBuffers(_hPipe);
   }
 };
 
@@ -150,15 +151,11 @@ public:
   }
 
   bool read_request() {
-    return _pipe.read_request(this, &_pipe);
+    return AttachOperation::read_request(&_pipe, &_pipe);
   }
 
 public:
   void complete(jint result, bufferedStream* result_stream) override;
-
-  ReplyWriter* get_reply_writer() override {
-    return &_pipe;
-  }
 };
 
 
@@ -435,6 +432,11 @@ Win32AttachOperation* Win32AttachListener::dequeue() {
 }
 
 void Win32AttachOperation::complete(jint result, bufferedStream* result_stream) {
+  JavaThread* thread = JavaThread::current();
+  ThreadBlockInVM tbivm(thread);
+
+  write_reply(&_pipe, result, result_stream);
+
   delete this;
 }
 

src/hotspot/os/windows/gc/z/zNUMA_windows.cpp

@@ -25,7 +25,10 @@
 
 void ZNUMA::pd_initialize() {
   _enabled = false;
-  _count = 1;
+}
+
+uint32_t ZNUMA::count() {
+  return 1;
 }
 
 uint32_t ZNUMA::id() {

src/hotspot/os/windows/os_windows.cpp

@@ -1689,11 +1689,11 @@ static errno_t convert_to_UTF16(char const* source_str, UINT source_encoding, LP
                                                 MB_ERR_INVALID_CHARS,
                                                 source_str,
                                                 -1, // source is null-terminated
-                                                nullptr,
+                                                NULL,
                                                 0); // estimate characters count
   if (len_estimated == 0) {
     // Probably source_str contains characters that cannot be represented in the source_encoding given.
-    *dest_utf16_str = nullptr;
+    *dest_utf16_str = NULL;
     return EINVAL;
   }
 
@@ -1726,11 +1726,11 @@ static errno_t convert_UTF16_to_platform(LPWSTR source_utf16_str, char*& dest_st
                                                 0,
                                                 source_utf16_str,
                                                 -1, // source is null-terminated
-                                                nullptr,
+                                                NULL,
                                                 0, // estimate characters count
-                                                nullptr, nullptr);
+                                                NULL, NULL);
   if (len_estimated == 0) {
-    dest_str = nullptr;
+    dest_str = NULL;
     return EINVAL;
   }
 
@@ -1740,7 +1740,7 @@ static errno_t convert_UTF16_to_platform(LPWSTR source_utf16_str, char*& dest_st
                                            0,
                                            source_utf16_str,
                                            -1, // source is null-terminated
-                                           dest_str, len_estimated, nullptr, nullptr);
+                                           dest_str, len_estimated, NULL, NULL);
   assert(len_real == len_estimated, "length already checked above");
 
   return ERROR_SUCCESS;
@@ -1752,7 +1752,7 @@ private:
 
 public:
   MemoryReleaserW(WCHAR * object_ptr) : _object_ptr(object_ptr) {}
-  ~MemoryReleaserW() { if (_object_ptr != nullptr) FREE_C_HEAP_ARRAY(WCHAR, _object_ptr); }
+  ~MemoryReleaserW() { if (_object_ptr != NULL) FREE_C_HEAP_ARRAY(WCHAR, _object_ptr); }
 };
 
 class MemoryReleaser : public StackObj {
@@ -1761,22 +1761,22 @@ private:
 
 public:
   MemoryReleaser(CHAR * object_ptr) : _object_ptr(object_ptr) {}
-  ~MemoryReleaser() { if (_object_ptr != nullptr) FREE_C_HEAP_ARRAY(CHAR, _object_ptr); }
+  ~MemoryReleaser() { if (_object_ptr != NULL) FREE_C_HEAP_ARRAY(CHAR, _object_ptr); }
 };
 
 // Loads .dll/.so and
 // in case of error it checks if .dll/.so was built for the
 // same architecture as Hotspot is running on
 void * os::dll_load_utf8(const char *utf8_name, char *ebuf, int ebuflen) {
-  LPWSTR utf16_name = nullptr;
+  LPWSTR utf16_name = NULL;
   errno_t err = convert_UTF8_to_UTF16(utf8_name, &utf16_name);
   MemoryReleaserW release_utf16_name(utf16_name);
   if (err != ERROR_SUCCESS) {
     errno = err;
-    return nullptr;
+    return NULL;
   }
 
-  char* platform_name = nullptr; // name of the library converted to the "platform" encoding for use in log messages
+  char* platform_name = NULL; // name of the library converted to the "platform" encoding for use in log messages
   errno_t ignored_err = convert_UTF16_to_platform(utf16_name, platform_name);
   MemoryReleaser release_platform_name(platform_name);
 
@@ -1784,8 +1784,8 @@ void * os::dll_load_utf8(const char *utf8_name, char *ebuf, int ebuflen) {
 
   void * result = LoadLibraryW(utf16_name);
 
-  if (result != nullptr) {
-    Events::log(nullptr, "Loaded shared library %s", platform_name);
+  if (result != NULL) {
+    Events::log(NULL, "Loaded shared library %s", platform_name);
     // Recalculate pdb search path if a DLL was loaded successfully.
     SymbolEngine::recalc_search_path();
     log_info(os)("shared library load of %s was successful", platform_name);
@@ -1796,13 +1796,13 @@ void * os::dll_load_utf8(const char *utf8_name, char *ebuf, int ebuflen) {
   // It may or may not be overwritten below (in the for loop and just above)
   lasterror(ebuf, (size_t) ebuflen);
   ebuf[ebuflen - 1] = '\0';
-  Events::log(nullptr, "Loading shared library %s failed, error code %lu", platform_name, errcode);
+  Events::log(NULL, "Loading shared library %s failed, error code %lu", platform_name, errcode);
   log_info(os)("shared library load of %s failed, error code %lu", platform_name, errcode);
 
   if (errcode == ERROR_MOD_NOT_FOUND) {
     strncpy(ebuf, "Can't find dependent libraries", ebuflen - 1);
     ebuf[ebuflen - 1] = '\0';
-    return nullptr;
+    return NULL;
   }
 
   // Parsing dll below
@@ -1812,7 +1812,7 @@ void * os::dll_load_utf8(const char *utf8_name, char *ebuf, int ebuflen) {
   // else call os::lasterror to obtain system error message
   int fd = ::wopen(utf16_name, O_RDONLY | O_BINARY, 0);
   if (fd < 0) {
-    return nullptr;
+    return NULL;
   }
 
   uint32_t signature_offset;
@@ -1838,7 +1838,7 @@ void * os::dll_load_utf8(const char *utf8_name, char *ebuf, int ebuflen) {
   ::close(fd);
   if (failed_to_get_lib_arch) {
     // file i/o error - report os::lasterror(...) msg
-    return nullptr;
+    return NULL;
   }
 
   typedef struct {
@@ -1866,7 +1866,7 @@ void * os::dll_load_utf8(const char *utf8_name, char *ebuf, int ebuflen) {
   // Obtain a string for printf operation
   // lib_arch_str shall contain string what platform this .dll was built for
   // running_arch_str shall string contain what platform Hotspot was built for
-  char *running_arch_str = nullptr, *lib_arch_str = nullptr;
+  char *running_arch_str = NULL, *lib_arch_str = NULL;
   for (unsigned int i = 0; i < ARRAY_SIZE(arch_array); i++) {
     if (lib_arch == arch_array[i].arch_code) {
       lib_arch_str = arch_array[i].arch_name;
@@ -1882,10 +1882,10 @@ void * os::dll_load_utf8(const char *utf8_name, char *ebuf, int ebuflen) {
   // If the architecture is right
   // but some other error took place - report os::lasterror(...) msg
   if (lib_arch == running_arch) {
-    return nullptr;
+    return NULL;
   }
 
-  if (lib_arch_str != nullptr) {
+  if (lib_arch_str != NULL) {
     jio_snprintf(ebuf, ebuflen - 1,
                 "Can't load %s-bit .dll on a %s-bit platform",
                 lib_arch_str, running_arch_str);
@@ -1896,7 +1896,7 @@ void * os::dll_load_utf8(const char *utf8_name, char *ebuf, int ebuflen) {
                 lib_arch, running_arch_str);
   }
 
-  return nullptr;
+  return NULL;
 }
 
 void * os::dll_load(const char *name, char *ebuf, int ebuflen) {

src/hotspot/os_cpu/aix_ppc/javaThread_aix_ppc.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 SAP SE. All rights reserved.
+ * Copyright (c) 2012, 2024 SAP SE. All rights reserved.
  * Copyright (c) 2022, IBM Corp.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,7 +27,6 @@
 #include "memory/metaspace.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/javaThread.hpp"
-#include "runtime/os.inline.hpp"
 
 frame JavaThread::pd_last_frame() {
   assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
@@ -48,17 +47,9 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
   if (has_last_Java_frame() && frame_anchor()->walkable()) {
     intptr_t* sp = last_Java_sp();
     address pc = _anchor.last_Java_pc();
-    if (pc == nullptr) {
-      // This is not uncommon. Many c1/c2 runtime stubs do not set the pc in the anchor.
-      intptr_t* top_sp = os::Aix::ucontext_get_sp((const ucontext_t*)ucontext);
-      if ((uint64_t)sp <= ((frame::common_abi*)top_sp)->callers_sp) {
-        // The interrupt occurred either in the last java frame or in its direct callee.
-        // We cannot be sure that the link register LR was already saved to the
-        // java frame. Therefore we discard this sample.
-        return false;
-      }
-      // The last java pc will be found in the abi part of the last java frame.
-    }
+    // pc can be seen as null because not all writers use store pc + release store sp.
+    // Simply discard the sample in this very rare case.
+    if (pc == nullptr) return false;
     *fr_addr = frame(sp, pc, frame::kind::code_blob);
     return true;
   }

src/hotspot/os_cpu/linux_ppc/javaThread_linux_ppc.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2025 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
@@ -46,17 +46,9 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* fr_addr, void* ucontext,
   if (has_last_Java_frame() && frame_anchor()->walkable()) {
     intptr_t* sp = last_Java_sp();
     address pc = _anchor.last_Java_pc();
-    if (pc == nullptr) {
-      // This is not uncommon. Many c1/c2 runtime stubs do not set the pc in the anchor.
-      intptr_t* top_sp = os::Linux::ucontext_get_sp((const ucontext_t*)ucontext);
-      if ((uint64_t)sp <= ((frame::common_abi*)top_sp)->callers_sp) {
-        // The interrupt occurred either in the last java frame or in its direct callee.
-        // We cannot be sure that the link register LR was already saved to the
-        // java frame. Therefore we discard this sample.
-        return false;
-      }
-      // The last java pc will be found in the abi part of the last java frame.
-    }
+    // pc can be seen as null because not all writers use store pc + release store sp.
+    // Simply discard the sample in this very rare case.
+    if (pc == nullptr) return false;
     *fr_addr = frame(sp, pc, frame::kind::code_blob);
     return true;
   }

src/hotspot/share/c1/c1_Compiler.cpp

@@ -222,7 +222,7 @@ bool Compiler::is_intrinsic_supported(vmIntrinsics::ID id) {
   case vmIntrinsics::_updateCRC32:
   case vmIntrinsics::_updateBytesCRC32:
   case vmIntrinsics::_updateByteBufferCRC32:
-#if defined(S390) || defined(PPC64) || defined(AARCH64) || defined(AMD64)
+#if defined(S390) || defined(PPC64) || defined(AARCH64)
   case vmIntrinsics::_updateBytesCRC32C:
   case vmIntrinsics::_updateDirectByteBufferCRC32C:
 #endif

src/hotspot/share/c1/c1_Instruction.cpp

@@ -810,13 +810,13 @@ bool BlockBegin::try_merge(ValueStack* new_state, bool has_irreducible_loops) {
       }
 
       for_each_stack_value(existing_state, index, existing_value) {
-        if ( !(existing_value->as_Phi() != nullptr && existing_value->as_Phi()->block() == this)) {
+        if ( !(existing_value->as_Phi() != NULL && existing_value->as_Phi()->block() == this)) {
           TRACE_PHI(tty->print_cr("Re-entered loop head without existing phi for stack - bailout"));
           return false;
         }
       }
       for_each_local_value(existing_state, index, existing_value) {
-        if (!(existing_value == new_state->local_at(index) || (existing_value->as_Phi() != nullptr && existing_value->as_Phi()->as_Phi()->block() == this))) {
+        if (!(existing_value == new_state->local_at(index) || (existing_value->as_Phi() != NULL && existing_value->as_Phi()->as_Phi()->block() == this))) {
           TRACE_PHI(tty->print_cr("Re-entered loop head without existing phi for modified local - bailout"));
           return false;
         }

src/hotspot/share/c1/c1_Runtime1.cpp

@@ -795,7 +795,7 @@ JRT_ENTRY(void, Runtime1::deoptimize(JavaThread* current, jint trap_request))
   Deoptimization::DeoptReason reason = Deoptimization::trap_request_reason(trap_request);
 
   if (action == Deoptimization::Action_make_not_entrant) {
-    if (nm->make_not_entrant("C1 deoptimize")) {
+    if (nm->make_not_entrant()) {
       if (reason == Deoptimization::Reason_tenured) {
         MethodData* trap_mdo = Deoptimization::get_method_data(current, method, true /*create_if_missing*/);
         if (trap_mdo != nullptr) {
@@ -1087,7 +1087,7 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* current, C1StubId stub_id ))
     // safepoint, but if it's still alive then make it not_entrant.
     nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
     if (nm != nullptr) {
-      nm->make_not_entrant("C1 code patch");
+      nm->make_not_entrant();
     }
 
     Deoptimization::deoptimize_frame(current, caller_frame.id());
@@ -1335,7 +1335,7 @@ void Runtime1::patch_code(JavaThread* current, C1StubId stub_id) {
     // Make sure the nmethod is invalidated, i.e. made not entrant.
     nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
     if (nm != nullptr) {
-      nm->make_not_entrant("C1 deoptimize for patching");
+      nm->make_not_entrant();
     }
   }
 
@@ -1463,7 +1463,7 @@ JRT_ENTRY(void, Runtime1::predicate_failed_trap(JavaThread* current))
 
   nmethod* nm = CodeCache::find_nmethod(caller_frame.pc());
   assert (nm != nullptr, "no more nmethod?");
-  nm->make_not_entrant("C1 predicate failed trap");
+  nm->make_not_entrant();
 
   methodHandle m(current, nm->method());
   MethodData* mdo = m->method_data();

src/hotspot/share/cds/cdsConfig.cpp

@@ -561,7 +561,7 @@ bool CDSConfig::is_dumping_final_static_archive() {
 
 bool CDSConfig::allow_only_single_java_thread() {
   // See comments in JVM_StartThread()
-  return is_dumping_classic_static_archive() || is_dumping_final_static_archive();
+  return is_dumping_static_archive();
 }
 
 bool CDSConfig::is_using_archive() {

src/hotspot/share/cds/cdsProtectionDomain.cpp

@@ -219,17 +219,6 @@ oop CDSProtectionDomain::to_file_URL(const char* path, Handle url_h, TRAPS) {
   return result.get_oop();
 }
 
-// https://bugs.openjdk.org/browse/JDK-8324259 -- the AppCDS archive must not contain any class from java.base.
-// Make sure that new classes loaded when jbr.java.io.use.nio=true do make into the archive.
-void CDSProtectionDomain::cds_preload_helper_init(TRAPS) {
-  JavaValue result(T_VOID);
-  JavaCalls::call_static(&result,
-                         vmClasses::jdk_internal_misc_CDSPreloadHelper_klass(),
-                         vmSymbols::CDSPreloadHelper_init_name(),
-                         vmSymbols::void_method_signature(),
-                         CATCH);
-}
-
 // Get the ProtectionDomain associated with the CodeSource from the classloader.
 Handle CDSProtectionDomain::get_protection_domain_from_classloader(Handle class_loader,
                                                                       Handle url, TRAPS) {

src/hotspot/share/cds/cdsProtectionDomain.hpp

@@ -81,7 +81,6 @@ public:
   static Handle get_shared_jar_manifest(int shared_path_index, TRAPS);
   static Handle get_shared_jar_url(int shared_path_index, TRAPS);
   static oop to_file_URL(const char* path, Handle url_h, TRAPS);
-  static void cds_preload_helper_init(TRAPS);
   static Handle get_protection_domain_from_classloader(Handle class_loader,
                                                        Handle url, TRAPS);
   static Handle get_shared_protection_domain(Handle class_loader,

src/hotspot/share/cds/heapShared.cpp

@@ -288,7 +288,7 @@ void HeapShared::clear_root(int index) {
   }
 }
 
-bool HeapShared::archive_object(oop obj, oop referrer, KlassSubGraphInfo* subgraph_info) {
+bool HeapShared::archive_object(oop obj, KlassSubGraphInfo* subgraph_info) {
   assert(CDSConfig::is_dumping_heap(), "dump-time only");
 
   assert(!obj->is_stackChunk(), "do not archive stack chunks");
@@ -304,7 +304,7 @@ bool HeapShared::archive_object(oop obj, oop referrer, KlassSubGraphInfo* subgra
   } else {
     count_allocation(obj->size());
     ArchiveHeapWriter::add_source_obj(obj);
-    CachedOopInfo info = make_cached_oop_info(obj, referrer);
+    CachedOopInfo info = make_cached_oop_info(obj);
     archived_object_cache()->put_when_absent(obj, info);
     archived_object_cache()->maybe_grow();
     mark_native_pointers(obj);
@@ -1350,39 +1350,33 @@ void HeapShared::clear_archived_roots_of(Klass* k) {
   }
 }
 
-// Push all oops that are referenced by _referencing_obj onto the _stack.
-class HeapShared::ReferentPusher: public BasicOopIterateClosure {
-  PendingOopStack* _stack;
-  GrowableArray<oop> _found_oop_fields;
+class WalkOopAndArchiveClosure: public BasicOopIterateClosure {
   int _level;
   bool _record_klasses_only;
   KlassSubGraphInfo* _subgraph_info;
   oop _referencing_obj;
+
+  // The following are for maintaining a stack for determining
+  // CachedOopInfo::_referrer
+  static WalkOopAndArchiveClosure* _current;
+  WalkOopAndArchiveClosure* _last;
  public:
-  ReferentPusher(PendingOopStack* stack,
-                           int level,
+  WalkOopAndArchiveClosure(int level,
                            bool record_klasses_only,
                            KlassSubGraphInfo* subgraph_info,
                            oop orig) :
-    _stack(stack),
-    _found_oop_fields(),
     _level(level),
     _record_klasses_only(record_klasses_only),
     _subgraph_info(subgraph_info),
     _referencing_obj(orig) {
+    _last = _current;
+    _current = this;
   }
-  void do_oop(narrowOop *p) { ReferentPusher::do_oop_work(p); }
-  void do_oop(      oop *p) { ReferentPusher::do_oop_work(p); }
-
-  ~ReferentPusher() {
-    while (_found_oop_fields.length() > 0) {
-      // This produces the exact same traversal order as the previous version
-      // of ReferentPusher that recurses on the C stack -- a depth-first search,
-      // walking the oop fields in _referencing_obj by ascending field offsets.
-      oop obj = _found_oop_fields.pop();
-      _stack->push(PendingOop(obj, _referencing_obj, _level + 1));
-    }
+  ~WalkOopAndArchiveClosure() {
+    _current = _last;
   }
+  void do_oop(narrowOop *p) { WalkOopAndArchiveClosure::do_oop_work(p); }
+  void do_oop(      oop *p) { WalkOopAndArchiveClosure::do_oop_work(p); }
 
  protected:
   template <class T> void do_oop_work(T *p) {
@@ -1402,15 +1396,20 @@ class HeapShared::ReferentPusher: public BasicOopIterateClosure {
         }
       }
 
-      _found_oop_fields.push(obj);
+      bool success = HeapShared::archive_reachable_objects_from(
+          _level + 1, _subgraph_info, obj);
+      assert(success, "VM should have exited with unarchivable objects for _level > 1");
     }
   }
 
  public:
+  static WalkOopAndArchiveClosure* current()  { return _current;              }
   oop referencing_obj()                       { return _referencing_obj;      }
   KlassSubGraphInfo* subgraph_info()          { return _subgraph_info;        }
 };
 
+WalkOopAndArchiveClosure* WalkOopAndArchiveClosure::_current = nullptr;
+
 // Checks if an oop has any non-null oop fields
 class PointsToOopsChecker : public BasicOopIterateClosure {
   bool _result;
@@ -1426,7 +1425,9 @@ public:
   bool result() { return _result; }
 };
 
-HeapShared::CachedOopInfo HeapShared::make_cached_oop_info(oop obj, oop referrer) {
+HeapShared::CachedOopInfo HeapShared::make_cached_oop_info(oop obj) {
+  WalkOopAndArchiveClosure* walker = WalkOopAndArchiveClosure::current();
+  oop referrer = (walker == nullptr) ? nullptr : walker->referencing_obj();
   PointsToOopsChecker points_to_oops_checker;
   obj->oop_iterate(&points_to_oops_checker);
   return CachedOopInfo(referrer, points_to_oops_checker.result());
@@ -1449,35 +1450,12 @@ void HeapShared::init_box_classes(TRAPS) {
 // (1) If orig_obj has not been archived yet, archive it.
 // (2) If orig_obj has not been seen yet (since start_recording_subgraph() was called),
 //     trace all  objects that are reachable from it, and make sure these objects are archived.
-// (3) Record the klasses of all objects that are reachable from orig_obj (including those that
-//     were already archived when this function is called)
+// (3) Record the klasses of all orig_obj and all reachable objects.
 bool HeapShared::archive_reachable_objects_from(int level,
                                                 KlassSubGraphInfo* subgraph_info,
                                                 oop orig_obj) {
   assert(orig_obj != nullptr, "must be");
-  PendingOopStack stack;
-  stack.push(PendingOop(orig_obj, nullptr, level));
 
-  while (stack.length() > 0) {
-    PendingOop po = stack.pop();
-    _object_being_archived = po;
-    bool status = walk_one_object(&stack, po.level(), subgraph_info, po.obj(), po.referrer());
-    _object_being_archived = PendingOop();
-
-    if (!status) {
-      // Don't archive a subgraph root that's too big. For archives static fields, that's OK
-      // as the Java code will take care of initializing this field dynamically.
-      assert(level == 1, "VM should have exited with unarchivable objects for _level > 1");
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGraphInfo* subgraph_info,
-                                 oop orig_obj, oop referrer) {
-  assert(orig_obj != nullptr, "must be");
   if (!JavaClasses::is_supported_for_archiving(orig_obj)) {
     // This object has injected fields that cannot be supported easily, so we disallow them for now.
     // If you get an error here, you probably made a change in the JDK library that has added
@@ -1546,7 +1524,7 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
   bool record_klasses_only = already_archived;
   if (!already_archived) {
     ++_num_new_archived_objs;
-    if (!archive_object(orig_obj, referrer, subgraph_info)) {
+    if (!archive_object(orig_obj, subgraph_info)) {
       // Skip archiving the sub-graph referenced from the current entry field.
       ResourceMark rm;
       log_error(cds, heap)(
@@ -1569,13 +1547,8 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
   Klass *orig_k = orig_obj->klass();
   subgraph_info->add_subgraph_object_klass(orig_k);
 
-  {
-    // Find all the oops that are referenced by orig_obj, push them onto the stack
-    // so we can work on them next.
-    ResourceMark rm;
-    ReferentPusher pusher(stack, level, record_klasses_only, subgraph_info, orig_obj);
-    orig_obj->oop_iterate(&pusher);
-  }
+  WalkOopAndArchiveClosure walker(level, record_klasses_only, subgraph_info, orig_obj);
+  orig_obj->oop_iterate(&walker);
 
   if (CDSConfig::is_initing_classes_at_dump_time()) {
     // The enum klasses are archived with aot-initialized mirror.
@@ -1600,7 +1573,8 @@ bool HeapShared::walk_one_object(PendingOopStack* stack, int level, KlassSubGrap
 // - No java.lang.Class instance (java mirror) can be included inside
 //   an archived sub-graph. Mirror can only be the sub-graph entry object.
 //
-// The Java heap object sub-graph archiving process (see ReferentPusher):
+// The Java heap object sub-graph archiving process (see
+// WalkOopAndArchiveClosure):
 //
 // 1) Java object sub-graph archiving starts from a given static field
 // within a Class instance (java mirror). If the static field is a
@@ -1748,7 +1722,6 @@ void HeapShared::check_special_subgraph_classes() {
 }
 
 HeapShared::SeenObjectsTable* HeapShared::_seen_objects_table = nullptr;
-HeapShared::PendingOop HeapShared::_object_being_archived;
 int HeapShared::_num_new_walked_objs;
 int HeapShared::_num_new_archived_objs;
 int HeapShared::_num_old_recorded_klasses;
@@ -2070,11 +2043,10 @@ bool HeapShared::is_dumped_interned_string(oop o) {
 
 void HeapShared::debug_trace() {
   ResourceMark rm;
-  oop referrer = _object_being_archived.referrer();
-  if (referrer != nullptr) {
+  WalkOopAndArchiveClosure* walker = WalkOopAndArchiveClosure::current();
+  if (walker != nullptr) {
     LogStream ls(Log(cds, heap)::error());
-    ls.print_cr("Reference trace");
-    CDSHeapVerifier::trace_to_root(&ls, referrer);
+    CDSHeapVerifier::trace_to_root(&ls, walker->referencing_obj());
   }
 }
 

src/hotspot/share/cds/heapShared.hpp

@@ -234,7 +234,7 @@ private:
   static DumpTimeKlassSubGraphInfoTable* _dump_time_subgraph_info_table;
   static RunTimeKlassSubGraphInfoTable _run_time_subgraph_info_table;
 
-  static CachedOopInfo make_cached_oop_info(oop obj, oop referrer);
+  static CachedOopInfo make_cached_oop_info(oop obj);
   static ArchivedKlassSubGraphInfoRecord* archive_subgraph_info(KlassSubGraphInfo* info);
   static void archive_object_subgraphs(ArchivableStaticFieldInfo fields[],
                                        bool is_full_module_graph);
@@ -314,7 +314,7 @@ private:
 
   static bool has_been_seen_during_subgraph_recording(oop obj);
   static void set_has_been_seen_during_subgraph_recording(oop obj);
-  static bool archive_object(oop obj, oop referrer, KlassSubGraphInfo* subgraph_info);
+  static bool archive_object(oop obj, KlassSubGraphInfo* subgraph_info);
 
   static void resolve_classes_for_subgraphs(JavaThread* current, ArchivableStaticFieldInfo fields[]);
   static void resolve_classes_for_subgraph_of(JavaThread* current, Klass* k);
@@ -340,30 +340,6 @@ private:
   static void archive_strings();
   static void archive_subgraphs();
 
-  // PendingOop and PendingOopStack are used for recursively discovering all cacheable
-  // heap objects. The recursion is done using PendingOopStack so we won't overflow the
-  // C stack with deep reference chains.
-  class PendingOop {
-    oop _obj;
-    oop _referrer;
-    int _level;
-
-  public:
-    PendingOop() : _obj(nullptr), _referrer(nullptr), _level(-1) {}
-    PendingOop(oop obj, oop referrer, int level) : _obj(obj), _referrer(referrer), _level(level) {}
-
-    oop obj()      const { return _obj; }
-    oop referrer() const { return _referrer; }
-    int level()    const { return _level; }
-  };
-
-  class ReferentPusher;
-  using PendingOopStack = GrowableArrayCHeap<PendingOop, mtClassShared>;
-
-  static PendingOop _object_being_archived;
-  static bool walk_one_object(PendingOopStack* stack, int level, KlassSubGraphInfo* subgraph_info,
-                              oop orig_obj, oop referrer);
-
  public:
   static void reset_archived_object_states(TRAPS);
   static void create_archived_object_cache() {

src/hotspot/share/cds/metaspaceShared.cpp

@@ -216,9 +216,30 @@ void MetaspaceShared::dump_loaded_classes(const char* file_name, TRAPS) {
   }
 }
 
+// If p is not aligned, move it up to the next address that's aligned with alignment.
+// If this is not possible (because p is too high), return nullptr. Example:
+//     p = 0xffffffffffff0000, alignment= 0x10000    => return nullptr.
+static char* align_up_or_null(char* p, size_t alignment) {
+  assert(p != nullptr, "sanity");
+  if (is_aligned(p, alignment)) {
+    return p;
+  }
+
+  char* down = align_down(p, alignment);
+  if (max_uintx - uintx(down) < uintx(alignment)) {
+    // Run out of address space to align up.
+    return nullptr;
+  }
+
+  char* aligned = align_up(p, alignment);
+  assert(aligned >= p, "sanity");
+  assert(aligned != nullptr, "sanity");
+  return aligned;
+}
+
 static bool shared_base_too_high(char* specified_base, char* aligned_base, size_t cds_max) {
-  // Caller should have checked that aligned_base was successfully aligned and is not nullptr.
-  // Comparing specified_base with nullptr is UB.
+  // Caller should have checked if align_up_or_null( returns nullptr (comparing specified_base
+  // with nullptr is UB).
   assert(aligned_base != nullptr, "sanity");
   assert(aligned_base >= specified_base, "sanity");
 
@@ -242,9 +263,7 @@ static char* compute_shared_base(size_t cds_max) {
     return specified_base;
   }
 
-  char* aligned_base = can_align_up(specified_base, alignment)
-                           ? align_up(specified_base, alignment)
-                           : nullptr;
+  char* aligned_base = align_up_or_null(specified_base, alignment);
 
   if (aligned_base != specified_base) {
     log_info(cds)("SharedBaseAddress (" INTPTR_FORMAT ") aligned up to " INTPTR_FORMAT,
@@ -804,10 +823,8 @@ void MetaspaceShared::preload_and_dump(TRAPS) {
 
   if (CDSConfig::new_aot_flags_used()) {
     if (CDSConfig::is_dumping_preimage_static_archive()) {
-      // We are in the JVM that runs the training run. Continue execution,
-      // so that it can finish all clean-up and return the correct exit
-      // code to the OS.
       tty->print_cr("AOTConfiguration recorded: %s", AOTConfiguration);
+      vm_exit(0);
     } else {
       // The JLI launcher only recognizes the "old" -Xshare:dump flag.
       // When the new -XX:AOTMode=create flag is used, we can't return
@@ -912,7 +929,6 @@ void MetaspaceShared::exercise_runtime_cds_code(TRAPS) {
 
   // Exercise FileSystem and URL code
   CDSProtectionDomain::to_file_URL("dummy.jar", Handle(), CHECK);
-  CDSProtectionDomain::cds_preload_helper_init(CHECK);
 }
 
 void MetaspaceShared::preload_and_dump_impl(StaticArchiveBuilder& builder, TRAPS) {

src/hotspot/share/ci/ciReplay.cpp

@@ -802,7 +802,7 @@ class CompileReplay : public StackObj {
     // Make sure the existence of a prior compile doesn't stop this one
     nmethod* nm = (entry_bci != InvocationEntryBci) ? method->lookup_osr_nmethod_for(entry_bci, comp_level, true) : method->code();
     if (nm != nullptr) {
-      nm->make_not_entrant("CI replay");
+      nm->make_not_entrant();
     }
     replay_state = this;
     CompileBroker::compile_method(methodHandle(THREAD, method), entry_bci, comp_level,

src/hotspot/share/ci/ciUtilities.cpp

@@ -26,7 +26,6 @@
 #include "gc/shared/cardTableBarrierSet.hpp"
 #include "gc/shared/cardTable.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shared/gc_globals.hpp"
 
 // ciUtilities
 //
@@ -46,6 +45,5 @@ CardTable::CardValue* ci_card_table_address() {
   BarrierSet* bs = BarrierSet::barrier_set();
   CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
   CardTable* ct = ctbs->card_table();
-  assert(!UseShenandoahGC, "Shenandoah byte_map_base is not constant.");
   return ct->byte_map_base();
 }

src/hotspot/share/classfile/compactHashtable.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, 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
@@ -241,6 +241,7 @@ template <
   bool (*EQUALS)(V value, K key, int len)
   >
 class CompactHashtable : public SimpleCompactHashtable {
+  friend class VMStructs;
 
   V decode(u4 offset) const {
     return DECODE(_base_address, offset);

src/hotspot/share/classfile/stringTable.hpp

@@ -40,6 +40,7 @@ class SerializeClosure;
 class StringTableConfig;
 
 class StringTable : AllStatic {
+  friend class VMStructs;
   friend class StringTableConfig;
 
   static volatile bool _has_work;

src/hotspot/share/classfile/symbolTable.cpp

@@ -67,7 +67,12 @@ inline bool symbol_equals_compact_hashtable_entry(Symbol* value, const char* key
 static OffsetCompactHashtable<
   const char*, Symbol*,
   symbol_equals_compact_hashtable_entry
-> _shared_table, _dynamic_shared_table, _shared_table_for_dumping;
+> _shared_table;
+
+static OffsetCompactHashtable<
+  const char*, Symbol*,
+  symbol_equals_compact_hashtable_entry
+> _dynamic_shared_table;
 
 // --------------------------------------------------------------------------
 
@@ -703,24 +708,29 @@ void SymbolTable::copy_shared_symbol_table(GrowableArray<Symbol*>* symbols,
 void SymbolTable::write_to_archive(GrowableArray<Symbol*>* symbols) {
   CompactHashtableWriter writer(int(_items_count), ArchiveBuilder::symbol_stats());
   copy_shared_symbol_table(symbols, &writer);
-  _shared_table_for_dumping.reset();
-  writer.dump(&_shared_table_for_dumping, "symbol");
+  if (CDSConfig::is_dumping_static_archive()) {
+    _shared_table.reset();
+    writer.dump(&_shared_table, "symbol");
+  } else {
+    assert(CDSConfig::is_dumping_dynamic_archive(), "must be");
+    _dynamic_shared_table.reset();
+    writer.dump(&_dynamic_shared_table, "symbol");
+  }
 }
 
 void SymbolTable::serialize_shared_table_header(SerializeClosure* soc,
                                                 bool is_static_archive) {
   OffsetCompactHashtable<const char*, Symbol*, symbol_equals_compact_hashtable_entry> * table;
-  if (soc->reading()) {
-    if (is_static_archive) {
-      table = &_shared_table;
-    } else {
-      table = &_dynamic_shared_table;
-    }
+  if (is_static_archive) {
+    table = &_shared_table;
   } else {
-    table = &_shared_table_for_dumping;
+    table = &_dynamic_shared_table;
   }
-
   table->serialize_header(soc);
+  if (soc->writing()) {
+    // Sanity. Make sure we don't use the shared table at dump time
+    table->reset();
+  }
 }
 #endif //INCLUDE_CDS
 

src/hotspot/share/classfile/symbolTable.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2025, 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
@@ -47,6 +47,7 @@ class constantPoolHandle;
 class SymbolClosure;
 
 class SymbolTable : public AllStatic {
+  friend class VMStructs;
   friend class Symbol;
   friend class ClassFileParser;
   friend class SymbolTableConfig;

src/hotspot/share/classfile/systemDictionary.hpp

@@ -79,6 +79,7 @@ class SystemDictionary : AllStatic {
   friend class AOTLinkedClassBulkLoader;
   friend class BootstrapInfo;
   friend class vmClasses;
+  friend class VMStructs;
 
  public:
 

src/hotspot/share/classfile/vmClassMacros.hpp

@@ -143,7 +143,6 @@
   do_klass(jdk_internal_loader_ClassLoaders_klass,      jdk_internal_loader_ClassLoaders                      ) \
   do_klass(jdk_internal_loader_ClassLoaders_AppClassLoader_klass,      jdk_internal_loader_ClassLoaders_AppClassLoader) \
   do_klass(jdk_internal_loader_ClassLoaders_PlatformClassLoader_klass, jdk_internal_loader_ClassLoaders_PlatformClassLoader) \
-  do_klass(jdk_internal_misc_CDSPreloadHelper_klass,    jdk_internal_misc_CDSPreloadHelper                    ) \
   do_klass(CodeSource_klass,                            java_security_CodeSource                              ) \
   do_klass(ConcurrentHashMap_klass,                     java_util_concurrent_ConcurrentHashMap                ) \
   do_klass(ArrayList_klass,                             java_util_ArrayList                                   ) \

src/hotspot/share/classfile/vmIntrinsics.hpp

@@ -189,8 +189,6 @@ class methodHandle;
   do_intrinsic(_minF,                     java_lang_Math,         min_name,           float2_float_signature,    F_S)   \
   do_intrinsic(_maxD,                     java_lang_Math,         max_name,           double2_double_signature,  F_S)   \
   do_intrinsic(_minD,                     java_lang_Math,         min_name,           double2_double_signature,  F_S)   \
-  do_intrinsic(_maxL,                     java_lang_Math,         max_name,           long2_long_signature,      F_S)   \
-  do_intrinsic(_minL,                     java_lang_Math,         min_name,           long2_long_signature,      F_S)   \
   do_intrinsic(_roundD,                   java_lang_Math,         round_name,         double_long_signature,     F_S)   \
   do_intrinsic(_roundF,                   java_lang_Math,         round_name,         float_int_signature,       F_S)   \
   do_intrinsic(_dcopySign,                java_lang_Math,         copySign_name,      double2_double_signature,  F_S)   \

src/hotspot/share/classfile/vmSymbols.hpp

@@ -738,8 +738,6 @@ class SerializeClosure;
   template(runtimeSetup,                                    "runtimeSetup")                                       \
   template(toFileURL_name,                                  "toFileURL")                                          \
   template(toFileURL_signature,                             "(Ljava/lang/String;)Ljava/net/URL;")                 \
-  template(jdk_internal_misc_CDSPreloadHelper,              "jdk/internal/misc/CDSPreloadHelper")                 \
-  template(CDSPreloadHelper_init_name,                      "init")                                               \
                                                                                                                   \
   /* jcmd Thread.dump_to_file */                                                                                  \
   template(jdk_internal_vm_ThreadDumper,           "jdk/internal/vm/ThreadDumper")                                \

src/hotspot/share/code/codeBlob.cpp

@@ -109,26 +109,26 @@ unsigned int CodeBlob::align_code_offset(int offset) {
 
 // This must be consistent with the CodeBlob constructor's layout actions.
 unsigned int CodeBlob::allocation_size(CodeBuffer* cb, int header_size) {
+  unsigned int size = header_size;
+  size += align_up(cb->total_relocation_size(), oopSize);
   // align the size to CodeEntryAlignment
-  unsigned int size = align_code_offset(header_size);
+  size = align_code_offset(size);
   size += align_up(cb->total_content_size(), oopSize);
   size += align_up(cb->total_oop_size(), oopSize);
+  size += align_up(cb->total_metadata_size(), oopSize);
   return size;
 }
 
 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,
-                   int mutable_data_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),
-  _mutable_data(nullptr),
   _size(size),
   _relocation_size(align_up(cb->total_relocation_size(), oopSize)),
-  _content_offset(CodeBlob::align_code_offset(header_size)),
+  _content_offset(CodeBlob::align_code_offset(header_size + _relocation_size)),
   _code_offset(_content_offset + cb->total_offset_of(cb->insts())),
   _data_offset(_content_offset + align_up(cb->total_content_size(), oopSize)),
   _frame_size(frame_size),
-  _mutable_data_size(mutable_data_size),
   S390_ONLY(_ctable_offset(0) COMMA)
   _header_size(header_size),
   _frame_complete_offset(frame_complete_offset),
@@ -139,20 +139,12 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int 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(is_nmethod() || (cb->total_oop_size() + cb->total_metadata_size() == 0), "must be nmethod");
   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
 
-  if (_mutable_data_size > 0) {
-    _mutable_data = (address)os::malloc(_mutable_data_size, mtCode);
-    if (_mutable_data == nullptr) {
-      vm_exit_out_of_memory(_mutable_data_size, OOM_MALLOC_ERROR, "codebuffer: no space for mutable data");
-    }
-  }
-
   set_oop_maps(oop_maps);
 }
 
@@ -160,7 +152,6 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, CodeBuffer* cb, int size
 CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t header_size) :
   _oop_maps(nullptr),
   _name(name),
-  _mutable_data(nullptr),
   _size(size),
   _relocation_size(0),
   _content_offset(CodeBlob::align_code_offset(header_size)),
@@ -178,10 +169,6 @@ CodeBlob::CodeBlob(const char* name, CodeBlobKind kind, int size, uint16_t heade
 }
 
 void CodeBlob::purge() {
-  if (_mutable_data != nullptr) {
-    os::free(_mutable_data);
-    _mutable_data = nullptr;
-  }
   if (_oop_maps != nullptr) {
     delete _oop_maps;
     _oop_maps = nullptr;
@@ -223,8 +210,7 @@ RuntimeBlob::RuntimeBlob(
   int         frame_size,
   OopMapSet*  oop_maps,
   bool        caller_must_gc_arguments)
-  : CodeBlob(name, kind, cb, size, header_size, frame_complete, frame_size, oop_maps, caller_must_gc_arguments,
-             align_up(cb->total_relocation_size(), oopSize))
+  : CodeBlob(name, kind, cb, size, header_size, frame_complete, frame_size, oop_maps, caller_must_gc_arguments)
 {
   cb->copy_code_and_locs_to(this);
 }

src/hotspot/share/code/codeBlob.hpp

@@ -67,14 +67,12 @@ enum class CodeBlobType {
 //   UpcallStub  : Used for upcalls from native code
 //
 //
-// Layout in the CodeCache:
+// Layout : continuous in the CodeCache
 //   - header
+//   - relocation
 //   - content space
 //     - instruction space
-// Outside of the CodeCache:
-//   - mutable_data
-//     - relocation info
-//     - additional data for subclasses
+//   - data space
 
 enum class CodeBlobKind : u1 {
   None,
@@ -106,15 +104,14 @@ protected:
   // order fields from large to small to minimize padding between fields
   ImmutableOopMapSet* _oop_maps;   // OopMap for this CodeBlob
   const char*         _name;
-  address             _mutable_data;
 
   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)
+
   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      _mutable_data_size;
 
   S390_ONLY(int _ctable_offset;)
 
@@ -145,8 +142,7 @@ protected:
   const Vptr* vptr() const;
 
   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,
-           int mutable_data_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, uint16_t header_size);
@@ -194,25 +190,20 @@ public:
   // Boundaries
   address    header_begin() const             { return (address)    this; }
   address    header_end() const               { return ((address)   this) + _header_size; }
+  relocInfo* relocation_begin() const         { return (relocInfo*) header_end(); }
+  relocInfo* relocation_end() const           { return (relocInfo*)(header_end()   + _relocation_size); }
   address    content_begin() const            { return (address)    header_begin() + _content_offset; }
   address    content_end() const              { return (address)    header_begin() + _data_offset; }
   address    code_begin() const               { return (address)    header_begin() + _code_offset; }
+  // code_end == content_end is true for all types of blobs for now, it is also checked in the constructor
   address    code_end() const                 { return (address)    header_begin() + _data_offset; }
   address    data_begin() const               { return (address)    header_begin() + _data_offset; }
   address    data_end() const                 { return (address)    header_begin() + _size; }
-  address    blob_end() const                 { return (address)    header_begin() + _size; }
-  // code_end == content_end is true for all types of blobs for now, it is also checked in the constructor
-
-  int mutable_data_size() const               { return _mutable_data_size; }
-  address mutable_data_begin() const          { return _mutable_data; }
-  address mutable_data_end() const            { return _mutable_data + _mutable_data_size; }
-
-  relocInfo* relocation_begin() const         { return (relocInfo*)_mutable_data; }
-  relocInfo* relocation_end() const           { return (relocInfo*)((address)relocation_begin() + _relocation_size); }
 
   // Offsets
   int content_offset() const                  { return _content_offset; }
   int code_offset() const                     { return _code_offset; }
+  int data_offset() const                     { return _data_offset; }
 
   // This field holds the beginning of the const section in the old code buffer.
   // It is needed to fix relocations of pc-relative loads when resizing the
@@ -230,11 +221,11 @@ public:
   // Only used from CodeCache::free_unused_tail() after the Interpreter blob was trimmed
   void adjust_size(size_t used) {
     _size = (int)used;
-    _data_offset = _size;
+    _data_offset = (int)used;
   }
 
   // Containment
-  bool blob_contains(address addr) const         { return header_begin()       <= addr && addr < blob_end();       }
+  bool blob_contains(address addr) const         { return header_begin()       <= addr && addr < data_end();       }
   bool code_contains(address addr) const         { return code_begin()         <= addr && addr < code_end();       }
   bool contains(address addr) const              { return content_begin()      <= addr && addr < content_end();    }
   bool is_frame_complete_at(address addr) const  { return _frame_complete_offset != CodeOffsets::frame_never_safe &&

src/hotspot/share/code/codeCache.cpp

@@ -868,7 +868,10 @@ void CodeCache::on_gc_marking_cycle_finish() {
 }
 
 void CodeCache::arm_all_nmethods() {
-  BarrierSet::barrier_set()->barrier_set_nmethod()->arm_all_nmethods();
+  BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
+  if (bs_nm != nullptr) {
+    bs_nm->arm_all_nmethods();
+  }
 }
 
 // Mark nmethods for unloading if they contain otherwise unreachable oops.
@@ -1361,7 +1364,7 @@ void CodeCache::make_marked_nmethods_deoptimized() {
   while(iter.next()) {
     nmethod* nm = iter.method();
     if (nm->is_marked_for_deoptimization() && !nm->has_been_deoptimized() && nm->can_be_deoptimized()) {
-      nm->make_not_entrant("marked for deoptimization");
+      nm->make_not_entrant();
       nm->make_deoptimized();
     }
   }

src/hotspot/share/code/nmethod.cpp

@@ -127,7 +127,6 @@ struct java_nmethod_stats_struct {
   uint nmethod_count;
   uint total_nm_size;
   uint total_immut_size;
-  uint total_mut_size;
   uint relocation_size;
   uint consts_size;
   uint insts_size;
@@ -148,7 +147,6 @@ struct java_nmethod_stats_struct {
     nmethod_count += 1;
     total_nm_size       += nm->size();
     total_immut_size    += nm->immutable_data_size();
-    total_mut_size      += nm->mutable_data_size();
     relocation_size     += nm->relocation_size();
     consts_size         += nm->consts_size();
     insts_size          += nm->insts_size();
@@ -168,7 +166,7 @@ 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);
-    uint total_size = total_nm_size + total_immut_size + total_mut_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);
@@ -177,6 +175,9 @@ struct java_nmethod_stats_struct {
     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);
     }
@@ -189,18 +190,12 @@ struct java_nmethod_stats_struct {
     if (oops_size != 0) {
       tty->print_cr("   oops          = %u (%f%%)", oops_size, (oops_size * 100.0f)/total_nm_size);
     }
-    if (total_mut_size != 0) {
-      tty->print_cr(" mutable data    = %u (%f%%)", total_mut_size, (total_mut_size * 100.0f)/total_size);
-    }
-    if (relocation_size != 0) {
-      tty->print_cr("   relocation    = %u (%f%%)", relocation_size, (relocation_size * 100.0f)/total_mut_size);
-    }
     if (metadata_size != 0) {
-      tty->print_cr("   metadata      = %u (%f%%)", metadata_size, (metadata_size * 100.0f)/total_mut_size);
+      tty->print_cr("   metadata      = %u (%f%%)", metadata_size, (metadata_size * 100.0f)/total_nm_size);
     }
 #if INCLUDE_JVMCI
     if (jvmci_data_size != 0) {
-      tty->print_cr("   JVMCI data    = %u (%f%%)", jvmci_data_size, (jvmci_data_size * 100.0f)/total_mut_size);
+      tty->print_cr("   JVMCI data    = %u (%f%%)", jvmci_data_size, (jvmci_data_size * 100.0f)/total_nm_size);
     }
 #endif
     if (total_immut_size != 0) {
@@ -688,6 +683,10 @@ address nmethod::oops_reloc_begin() const {
     return code_begin() + frame_complete_offset();
   }
 
+  // It is not safe to read oops concurrently using entry barriers, if their
+  // location depend on whether the nmethod is entrant or not.
+  // assert(BarrierSet::barrier_set()->barrier_set_nmethod() == nullptr, "Not safe oop scan");
+
   address low_boundary = verified_entry_point();
   if (!is_in_use()) {
     low_boundary += NativeJump::instruction_size;
@@ -1073,13 +1072,6 @@ static void assert_no_oops_or_metadata(nmethod* nm) {
 }
 #endif
 
-static int required_mutable_data_size(CodeBuffer* code_buffer,
-                                      int jvmci_data_size = 0) {
-  return align_up(code_buffer->total_relocation_size(), oopSize) +
-         align_up(code_buffer->total_metadata_size(), oopSize) +
-         align_up(jvmci_data_size, oopSize);
-}
-
 nmethod* nmethod::new_native_nmethod(const methodHandle& method,
   int compile_id,
   CodeBuffer *code_buffer,
@@ -1104,8 +1096,6 @@ nmethod* nmethod::new_native_nmethod(const methodHandle& method,
       offsets.set_value(CodeOffsets::Exceptions, exception_handler);
     }
 
-    int mutable_data_size = required_mutable_data_size(code_buffer);
-
     // MH intrinsics are dispatch stubs which are compatible with NonNMethod space.
     // IsUnloadingBehaviour::is_unloading needs to handle them separately.
     bool allow_NonNMethod_space = method->can_be_allocated_in_NonNMethod_space();
@@ -1115,7 +1105,7 @@ nmethod* nmethod::new_native_nmethod(const methodHandle& method,
             code_buffer, frame_size,
             basic_lock_owner_sp_offset,
             basic_lock_sp_offset,
-            oop_maps, mutable_data_size);
+            oop_maps);
     DEBUG_ONLY( if (allow_NonNMethod_space) assert_no_oops_or_metadata(nm); )
     NOT_PRODUCT(if (nm != nullptr) native_nmethod_stats.note_native_nmethod(nm));
   }
@@ -1154,6 +1144,11 @@ nmethod* nmethod::new_nmethod(const methodHandle& method,
   // create nmethod
   nmethod* nm = nullptr;
   int nmethod_size = CodeBlob::allocation_size(code_buffer, sizeof(nmethod));
+#if INCLUDE_JVMCI
+    if (compiler->is_jvmci()) {
+      nmethod_size += align_up(jvmci_data->size(), oopSize);
+    }
+#endif
 
   int immutable_data_size =
       adjust_pcs_size(debug_info->pcs_size())
@@ -1174,15 +1169,11 @@ nmethod* nmethod::new_nmethod(const methodHandle& method,
       return nullptr;
     }
   }
-
-  int mutable_data_size = required_mutable_data_size(code_buffer
-    JVMCI_ONLY(COMMA (compiler->is_jvmci() ? jvmci_data->size() : 0)));
-
   {
     MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
 
     nm = new (nmethod_size, comp_level)
-    nmethod(method(), compiler->type(), nmethod_size, immutable_data_size, mutable_data_size,
+    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
@@ -1285,10 +1276,9 @@ nmethod::nmethod(
   int frame_size,
   ByteSize basic_lock_owner_sp_offset,
   ByteSize basic_lock_sp_offset,
-  OopMapSet* oop_maps,
-  int mutable_data_size)
+  OopMapSet* oop_maps )
   : CodeBlob("native nmethod", CodeBlobKind::Nmethod, code_buffer, nmethod_size, sizeof(nmethod),
-             offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false, mutable_data_size),
+             offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false),
   _deoptimization_generation(0),
   _gc_epoch(CodeCache::gc_epoch()),
   _method(method),
@@ -1322,15 +1312,17 @@ nmethod::nmethod(
     _deopt_mh_handler_offset = 0;
     _unwind_handler_offset   = 0;
 
-    CHECKED_CAST(_oops_size, uint16_t, align_up(code_buffer->total_oop_size(), oopSize));
-    int metadata_size = align_up(code_buffer->total_metadata_size(), wordSize);
-    JVMCI_ONLY( _jvmci_data_size = 0; )
-    assert(_mutable_data_size == _relocation_size + metadata_size,
-           "wrong mutable data size: %d != %d + %d",
-           _mutable_data_size, _relocation_size, metadata_size);
+    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
+    // 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          = blob_end();
+    _immutable_data          = data_end();
     _immutable_data_size     = 0;
     _nul_chk_table_offset    = 0;
     _handler_table_offset    = 0;
@@ -1407,7 +1399,6 @@ nmethod::nmethod(
   CompilerType type,
   int nmethod_size,
   int immutable_data_size,
-  int mutable_data_size,
   int compile_id,
   int entry_bci,
   address immutable_data,
@@ -1429,7 +1420,7 @@ nmethod::nmethod(
 #endif
   )
   : CodeBlob("nmethod", CodeBlobKind::Nmethod, code_buffer, nmethod_size, sizeof(nmethod),
-             offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false, mutable_data_size),
+             offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps, false),
   _deoptimization_generation(0),
   _gc_epoch(CodeCache::gc_epoch()),
   _method(method),
@@ -1495,16 +1486,18 @@ nmethod::nmethod(
     } else {
       _unwind_handler_offset = -1;
     }
+    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);
 
-    CHECKED_CAST(_oops_size, uint16_t, align_up(code_buffer->total_oop_size(), oopSize));
-    uint16_t metadata_size = (uint16_t)align_up(code_buffer->total_metadata_size(), wordSize);
-    JVMCI_ONLY(CHECKED_CAST(_jvmci_data_size, uint16_t, align_up(compiler->is_jvmci() ? jvmci_data->size() : 0, oopSize)));
-    int jvmci_data_size = 0 JVMCI_ONLY(+ _jvmci_data_size);
-    assert(_mutable_data_size == _relocation_size + metadata_size + jvmci_data_size,
-           "wrong mutable data size: %d != %d + %d + %d",
-           _mutable_data_size, _relocation_size, metadata_size, jvmci_data_size);
-    assert(nmethod_size == data_end() - header_begin(), "wrong nmethod size: %d != %d",
-           nmethod_size, (int)(code_end() - header_begin()));
+#if INCLUDE_JVMCI
+    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); )
+#else
+    DEBUG_ONLY( int data_end_offset = metadata_end_offset; )
+#endif
+    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) {
@@ -1512,7 +1505,7 @@ nmethod::nmethod(
       _immutable_data     = immutable_data;
     } else {
       // We need unique not null address
-      _immutable_data     = blob_end();
+      _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)));
@@ -1964,27 +1957,21 @@ void nmethod::invalidate_osr_method() {
   }
 }
 
-void nmethod::log_state_change(const char* reason) const {
-  assert(reason != nullptr, "Must provide a reason");
-
+void nmethod::log_state_change() const {
   if (LogCompilation) {
     if (xtty != nullptr) {
       ttyLocker ttyl;  // keep the following output all in one block
-      xtty->begin_elem("make_not_entrant thread='%zu' reason='%s'",
-                       os::current_thread_id(), reason);
+      xtty->begin_elem("make_not_entrant thread='%zu'",
+                       os::current_thread_id());
       log_identity(xtty);
       xtty->stamp();
       xtty->end_elem();
     }
   }
 
-  ResourceMark rm;
-  stringStream ss(NEW_RESOURCE_ARRAY(char, 256), 256);
-  ss.print("made not entrant: %s", reason);
-
-  CompileTask::print_ul(this, ss.freeze());
+  CompileTask::print_ul(this, "made not entrant");
   if (PrintCompilation) {
-    print_on_with_msg(tty, ss.freeze());
+    print_on_with_msg(tty, "made not entrant");
   }
 }
 
@@ -1995,9 +1982,7 @@ void nmethod::unlink_from_method() {
 }
 
 // Invalidate code
-bool nmethod::make_not_entrant(const char* reason) {
-  assert(reason != nullptr, "Must provide a reason");
-
+bool nmethod::make_not_entrant() {
   // This can be called while the system is already at a safepoint which is ok
   NoSafepointVerifier nsv;
 
@@ -2055,7 +2040,7 @@ bool nmethod::make_not_entrant(const char* reason) {
     assert(success, "Transition can't fail");
 
     // Log the transition once
-    log_state_change(reason);
+    log_state_change();
 
     // Remove nmethod from method.
     unlink_from_method();
@@ -2142,9 +2127,9 @@ void nmethod::purge(bool unregister_nmethod) {
   }
   delete[] _compiled_ic_data;
 
-  if (_immutable_data != blob_end()) {
+  if (_immutable_data != data_end()) {
     os::free(_immutable_data);
-    _immutable_data = blob_end(); // Valid not null address
+    _immutable_data = data_end(); // Valid not null address
   }
   if (unregister_nmethod) {
     Universe::heap()->unregister_nmethod(this);
@@ -3076,6 +3061,10 @@ void nmethod::print_on_impl(outputStream* st) const {
                                              p2i(this),
                                              p2i(this) + size(),
                                              size());
+  if (relocation_size   () > 0) st->print_cr(" relocation     [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
+                                             p2i(relocation_begin()),
+                                             p2i(relocation_end()),
+                                             relocation_size());
   if (consts_size       () > 0) st->print_cr(" constants      [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
                                              p2i(consts_begin()),
                                              p2i(consts_end()),
@@ -3092,14 +3081,6 @@ void nmethod::print_on_impl(outputStream* st) const {
                                              p2i(oops_begin()),
                                              p2i(oops_end()),
                                              oops_size());
-  if (mutable_data_size() > 0) st->print_cr(" mutable data [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
-                                             p2i(mutable_data_begin()),
-                                             p2i(mutable_data_end()),
-                                             mutable_data_size());
-  if (relocation_size() > 0)   st->print_cr(" relocation     [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
-                                             p2i(relocation_begin()),
-                                             p2i(relocation_end()),
-                                             relocation_size());
   if (metadata_size     () > 0) st->print_cr(" metadata       [" INTPTR_FORMAT "," INTPTR_FORMAT "] = %d",
                                              p2i(metadata_begin()),
                                              p2i(metadata_end()),
@@ -3569,10 +3550,7 @@ const char* nmethod::reloc_string_for(u_char* begin, u_char* end) {
   while (iter.next()) {
     have_one = true;
     switch (iter.type()) {
-        case relocInfo::none: {
-          // Skip it and check next
-          break;
-        }
+        case relocInfo::none:                  return "no_reloc";
         case relocInfo::oop_type: {
           // Get a non-resizable resource-allocated stringStream.
           // Our callees make use of (nested) ResourceMarks.
@@ -3601,16 +3579,6 @@ const char* nmethod::reloc_string_for(u_char* begin, u_char* end) {
           st.print("runtime_call");
           CallRelocation* r = (CallRelocation*)iter.reloc();
           address dest = r->destination();
-          if (StubRoutines::contains(dest)) {
-            StubCodeDesc* desc = StubCodeDesc::desc_for(dest);
-            if (desc == nullptr) {
-              desc = StubCodeDesc::desc_for(dest + frame::pc_return_offset);
-            }
-            if (desc != nullptr) {
-              st.print(" Stub::%s", desc->name());
-              return st.as_string();
-            }
-          }
           CodeBlob* cb = CodeCache::find_blob(dest);
           if (cb != nullptr) {
             st.print(" %s", cb->name());